27 changed files with 737 additions and 1059 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,19 +0,0 @@
-# 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"
--- a/.github/stale.sh
+++ b/.github/stale.sh
@ -0,0 +1,13 @@
+#!/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
--- a/.github/workflows/autoapprove.yml
+++ b/.github/workflows/autoapprove.yml
@ -1,20 +0,0 @@
-name: "autoapprove"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  autoapprove:
-    runs-on: ubuntu-latest
-    steps:
-      - name: approve
-        uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
-        id: approve
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@ -1,21 +0,0 @@
-name: "automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'vtolstov'
-    steps:
-      - name: merge
-        id: merge
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -3,20 +3,19 @@ on:
 push:
    branches:
    - master
-    - v3
 jobs:
  test:
    name: test
    runs-on: ubuntu-latest
    steps:
    - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v1
      with:
-        go-version: 1.17
+        go-version: 1.15
    - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
    - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      with:
        path: ~/go/pkg/mod
        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@ -32,9 +31,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
      - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v1
        continue-on-error: true
        with:
          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -1,78 +0,0 @@
-# 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@v3
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    # Initializes the CodeQL tools for scanning.
-    - name: init
-      uses: github/codeql-action/init@v2
-      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@v2
-
-    # ℹ️ 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@v2
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@ -1,27 +0,0 @@
-name: "dependabot-automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
-    steps:
-      - name: metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.3.6
-        with:
-          github-token: "${{ secrets.TOKEN }}"
-      - name: merge
-        id: 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}}
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -3,20 +3,19 @@ on:
  pull_request:
    branches:
    - master
-    - v3
 jobs:
  test:
    name: test
    runs-on: ubuntu-latest
    steps:
    - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v1
      with:
-        go-version: 1.17
+        go-version: 1.15
    - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
    - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      with:
        path: ~/go/pkg/mod
        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@ -32,9 +31,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
      - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v1
        continue-on-error: true
        with:
          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
--- a/.gitignore
+++ b/.gitignore
@ -1,24 +0,0 @@
-# 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
--- a/.golangci.yml
+++ b/.golangci.yml
@ -1,44 +0,0 @@
-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
--- a/codec.go
+++ b/codec.go
@ -3,14 +3,25 @@ package grpc
 import (
 	"io"

-	"go.unistack.org/micro/v3/codec"
+	"github.com/unistack-org/micro/v3/codec"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )

-var (
-	_ codec.Codec    = &wrapGrpcCodec{}
-	_ encoding.Codec = &wrapMicroCodec{}
-)
+type wrapStream struct{ grpc.ServerStream }
+
+func (w *wrapStream) Write(d []byte) (int, error) {
+	n := len(d)
+	err := w.ServerStream.SendMsg(&codec.Frame{Data: d})
+	return n, err
+}
+
+func (w *wrapStream) Read(d []byte) (int, error) {
+	m := &codec.Frame{}
+	err := w.ServerStream.RecvMsg(m)
+	d = m.Data
+	return len(d), err
+}

 type wrapMicroCodec struct{ codec.Codec }

@ -18,54 +29,50 @@ func (w *wrapMicroCodec) Name() string {
 	return w.Codec.String()
 }

-func (w *wrapMicroCodec) Marshal(v interface{}) ([]byte, error) {
-	return w.Codec.Marshal(v)
-}
-
-func (w *wrapMicroCodec) Unmarshal(d []byte, v interface{}) error {
-	return w.Codec.Unmarshal(d, v)
-}
-
 type wrapGrpcCodec struct{ encoding.Codec }

 func (w *wrapGrpcCodec) String() string {
 	return w.Codec.Name()
 }

-func (w *wrapGrpcCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
-	if m, ok := v.(*codec.Frame); ok {
+func (w *wrapGrpcCodec) Marshal(v interface{}) ([]byte, error) {
+	switch m := v.(type) {
+	case *codec.Frame:
 		return m.Data, nil
 	}
 	return w.Codec.Marshal(v)
 }

-func (w *wrapGrpcCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
+func (w wrapGrpcCodec) Unmarshal(d []byte, v interface{}) error {
 	if d == nil || v == nil {
 		return nil
 	}
-	if m, ok := v.(*codec.Frame); ok {
+	switch m := v.(type) {
+	case *codec.Frame:
 		m.Data = d
 		return nil
 	}
 	return w.Codec.Unmarshal(d, v)
 }

-func (w *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.MessageType) error {
+func (g *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.MessageType) error {
 	return nil
 }

-func (w *wrapGrpcCodec) ReadBody(conn io.Reader, v interface{}) error {
-	if m, ok := v.(*codec.Frame); ok {
+func (g *wrapGrpcCodec) ReadBody(conn io.Reader, v interface{}) error {
+	// caller has requested a frame
+	switch m := v.(type) {
+	case *codec.Frame:
 		_, err := conn.Read(m.Data)
 		return err
 	}
 	return codec.ErrInvalidMessage
 }

-func (w *wrapGrpcCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
+func (g *wrapGrpcCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
 	// if we don't have a body
 	if v != nil {
-		b, err := w.Marshal(v)
+		b, err := g.Marshal(v)
 		if err != nil {
 			return err
 		}
--- a/context.go
+++ b/context.go
@ -0,0 +1,16 @@
+package grpc
+
+import (
+	"context"
+
+	"github.com/unistack-org/micro/v3/server"
+)
+
+func setServerOption(k, v interface{}) server.Option {
+	return func(o *server.Options) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
--- a/error.go
+++ b/error.go
@ -6,11 +6,12 @@ import (
 	"net/http"
 	"os"

-	"go.unistack.org/micro/v3/errors"
+	"github.com/unistack-org/micro/v3/errors"
 	"google.golang.org/grpc/codes"
 )

-var errMapping = map[int32]codes.Code{
+var (
+	errMapping = map[int32]codes.Code{
 		http.StatusOK:                  codes.OK,
 		http.StatusBadRequest:          codes.InvalidArgument,
 		http.StatusRequestTimeout:      codes.DeadlineExceeded,
@ -23,6 +24,7 @@ var errMapping = map[int32]codes.Code{
 		http.StatusInternalServerError: codes.Internal,
 		http.StatusServiceUnavailable:  codes.Unavailable,
 	}
+)

 // convertCode converts a standard Go error into its canonical code. Note that
 // this is only used to translate the error returned by the server applications.
@ -58,7 +60,8 @@ func microError(err error) codes.Code {
 	}

 	var ec int32
-	if verr, ok := err.(*errors.Error); ok {
+	switch verr := err.(type) {
+	case *errors.Error:
 		ec = verr.Code
 	}

--- a/go.mod
+++ b/go.mod
@ -1,28 +1,16 @@
-module go.unistack.org/micro-server-grpc/v3
-
-go 1.20
+module github.com/unistack-org/micro-server-grpc/v3

+go 1.15

 require (
-	github.com/golang/protobuf v1.5.4
-	github.com/quic-go/quic-go v0.41.0
-	go.unistack.org/micro/v3 v3.10.48
-	golang.org/x/net v0.22.0
-	google.golang.org/grpc v1.62.1
-	google.golang.org/protobuf v1.33.0
+	github.com/golang/protobuf v1.4.3
+	github.com/google/go-cmp v0.5.1 // indirect
+	github.com/unistack-org/micro/v3 v3.2.2
+	golang.org/x/net v0.0.0-20201224014010-6772e930b67b
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
+	google.golang.org/grpc v1.35.0
+	google.golang.org/protobuf v1.25.0
 )

-require (
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
-	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
-	github.com/onsi/ginkgo/v2 v2.16.0 // indirect
-	github.com/stretchr/testify v1.8.3 // indirect
-	go.uber.org/mock v0.4.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
-	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
-)
+//replace github.com/unistack-org/micro/v3 => ../../micro
--- a/go.sum
+++ b/go.sum
@ -1,53 +1,145 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q=
-github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
-github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
-github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
-github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
-github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+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/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+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 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.5 h1:kxhtnfFVi+rYdOALN0B3k9UT86zVJKfBimRaciULW4I=
+github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
+github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+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/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k=
-github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
-go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
-go.unistack.org/micro/v3 v3.10.48 h1:Ewht/3gNJNHcG7crQSuq5ys60tgVJYgtQ2oyymJspko=
-go.unistack.org/micro/v3 v3.10.48/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
-golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
-golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
-golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
-golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 h1:IR+hp6ypxjH24bkMfEJ0yHR21+gwPWdV+/IBrPQyn3k=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
-google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
-google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/unistack-org/micro/v3 v3.2.2 h1:wli8jSMheABvEdU2tCdqeBEH4HlOCSmPxizud8DklNo=
+github.com/unistack-org/micro/v3 v3.2.2/go.mod h1:J8XxJj4Pqa3Ee0a4biRRtut7UwTlfBq8QRe+s4PKGS0=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+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/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+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=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d h1:92D1fum1bJLKSdr11OJ+54YeCMCGYIygTA7R/YZxH5M=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.35.0 h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/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=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/grpc.go
+++ b/grpc.go
@ -1,5 +1,5 @@
 // Package grpc provides a grpc server
-package grpc // import "go.unistack.org/micro-server-grpc/v3"
+package grpc

 import (
 	"context"
@ -7,63 +7,67 @@ import (
 	"fmt"
 	"net"
 	"reflect"
+	"runtime/debug"
 	"sort"
 	"strconv"
 	"strings"
 	"sync"
 	"time"

-	// nolint: staticcheck
 	oldproto "github.com/golang/protobuf/proto"
-	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/codec"
-	"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/semconv"
-	"go.unistack.org/micro/v3/server"
-	msync "go.unistack.org/micro/v3/sync"
+	"github.com/unistack-org/micro/v3/broker"
+	"github.com/unistack-org/micro/v3/codec"
+	"github.com/unistack-org/micro/v3/errors"
+	"github.com/unistack-org/micro/v3/logger"
+	meta "github.com/unistack-org/micro/v3/metadata"
+	"github.com/unistack-org/micro/v3/register"
+	"github.com/unistack-org/micro/v3/server"
 	"golang.org/x/net/netutil"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/encoding"
-	gmetadata "google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
+	grpcreflect "google.golang.org/grpc/reflection/grpc_reflection_v1alpha"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
 )

 const (
-	DefaultContentType = "application/grpc"
+	defaultContentType = "application/grpc"
 )

-/*
-type ServerReflection struct {
+type grpcServerReflection struct {
 	srv *grpc.Server
 	s   *serverReflectionServer
 }
-*/

-type Server struct {
-	handlers       map[string]server.Handler
+type grpcServer struct {
+	rpc  *rServer
 	srv  *grpc.Server
 	exit chan chan error
-	wg             *msync.WaitGroup
-	rsvc           *register.Service
-	subscribers    map[*subscriber][]broker.Subscriber
-	rpc            *rServer
-	opts           server.Options
-	unknownHandler grpc.StreamHandler
+	wg   *sync.WaitGroup
+
 	sync.RWMutex
+	opts        server.Options
+	handlers    map[string]server.Handler
+	subscribers map[*subscriber][]broker.Subscriber
+	// marks the serve as started
 	started bool
+	// used for first registration
 	registered bool
+
 	reflection bool
+	// register service instance
+	rsvc *register.Service
+
+	codecs map[string]codec.Codec
 }

-func newServer(opts ...server.Option) *Server {
+func newGRPCServer(opts ...server.Option) server.Server {
 	// create a grpc server
-	g := &Server{
+	g := &grpcServer{
 		opts: server.NewOptions(opts...),
 		rpc: &rServer{
 			serviceMap: make(map[string]*service),
@ -76,7 +80,6 @@ func newServer(opts ...server.Option) *Server {
 	return g
 }

-/*
 type grpcRouter struct {
 	h func(context.Context, server.Request, interface{}) error
 	m func(context.Context, server.Message) error
@ -90,9 +93,7 @@ func (r grpcRouter) ServeRequest(ctx context.Context, req server.Request, rsp se
 	return r.h(ctx, req, rsp)
 }

-*/
-
-func (g *Server) configure(opts ...server.Option) error {
+func (g *grpcServer) configure(opts ...server.Option) error {
 	g.Lock()
 	defer g.Unlock()

@ -100,23 +101,12 @@ func (g *Server) configure(opts ...server.Option) error {
 		o(&g.opts)
 	}

-	if err := g.opts.Register.Init(); err != nil {
-		return err
+	if g.opts.Register == nil {
+		return fmt.Errorf("register not set")
 	}
-	if err := g.opts.Broker.Init(); err != nil {
-		return err
-	}
-	if err := g.opts.Tracer.Init(); err != nil {
-		return err
-	}
-	if err := g.opts.Logger.Init(); err != nil {
-		return err
-	}
-	if err := g.opts.Meter.Init(); err != nil {
-		return err
-	}
-	if err := g.opts.Transport.Init(); err != nil {
-		return err
+
+	if g.opts.Broker == nil {
+		return fmt.Errorf("broker not set")
 	}

 	g.wg = g.opts.Wait
@ -129,10 +119,6 @@ func (g *Server) configure(opts ...server.Option) error {
 		}
 	}

-	for _, k := range g.opts.Codecs {
-		encoding.RegisterCodec(&wrapMicroCodec{k})
-	}
-
 	maxMsgSize := g.getMaxMsgSize()

 	gopts := []grpc.ServerOption{
@ -141,8 +127,12 @@ func (g *Server) configure(opts ...server.Option) error {
 		grpc.UnknownServiceHandler(g.handler),
 	}

+	if creds := g.getCredentials(); creds != nil {
+		gopts = append(gopts, grpc.Creds(creds))
+	}
+
 	if opts := g.getGrpcOptions(); opts != nil {
-		gopts = append(opts, gopts...)
+		gopts = append(gopts, opts...)
 	}

 	g.rsvc = nil
@ -159,10 +149,6 @@ func (g *Server) configure(opts ...server.Option) error {
 		g.reflection = v
 	}

-	if h, ok := g.opts.Context.Value(unknownServiceHandlerKey{}).(grpc.StreamHandler); ok {
-		g.unknownHandler = h
-	}
-
 	if restart {
 		return g.Start()
 	}
@ -170,7 +156,7 @@ func (g *Server) configure(opts ...server.Option) error {
 	return nil
 }

-func (g *Server) getMaxMsgSize() int {
+func (g *grpcServer) getMaxMsgSize() int {
 	if g.opts.Context == nil {
 		return codec.DefaultMaxMsgSize
 	}
@ -181,7 +167,16 @@ func (g *Server) getMaxMsgSize() int {
 	return s
 }

-func (g *Server) getGrpcOptions() []grpc.ServerOption {
+func (g *grpcServer) getCredentials() credentials.TransportCredentials {
+	if g.opts.Context != nil {
+		if v, ok := g.opts.Context.Value(tlsAuth{}).(*tls.Config); ok && v != nil {
+			return credentials.NewTLS(v)
+		}
+	}
+	return nil
+}
+
+func (g *grpcServer) getGrpcOptions() []grpc.ServerOption {
 	if g.opts.Context == nil {
 		return nil
 	}
@ -194,112 +189,146 @@ func (g *Server) getGrpcOptions() []grpc.ServerOption {
 	return opts
 }

-func (g *Server) handler(srv interface{}, stream grpc.ServerStream) error {
-	var err error
-
-	fullMethod, ok := grpc.MethodFromServerStream(stream)
-	if !ok {
-		return status.Errorf(codes.Internal, "method does not exist in context")
-	}
-
-	ts := time.Now()
-	g.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", fullMethod).Inc()
+func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) (err error) {
 	defer func() {
-		te := time.Since(ts)
-		g.opts.Meter.Summary(semconv.ServerRequestLatencyMicroseconds, "endpoint", fullMethod).Update(te.Seconds())
-		g.opts.Meter.Histogram(semconv.ServerRequestDurationSeconds, "endpoint", fullMethod).Update(te.Seconds())
-		g.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", fullMethod).Dec()
-
-		st := status.Convert(err)
-		if st == nil || st.Code() == codes.OK {
-			g.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", fullMethod, "status", "success", "code", strconv.Itoa(int(codes.OK))).Inc()
-		} else {
-			g.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", fullMethod, "status", "failure", "code", strconv.Itoa(int(st.Code()))).Inc()
+		if r := recover(); r != nil {
+			g.RLock()
+			config := g.opts
+			g.RUnlock()
+			if config.Logger.V(logger.ErrorLevel) {
+				config.Logger.Error(config.Context, "panic recovered: ", r)
+				config.Logger.Error(config.Context, string(debug.Stack()))
+			}
+			err = errors.InternalServerError(g.opts.Name, "panic recovered: %v", r)
+		} else if err != nil {
+			g.RLock()
+			config := g.opts
+			g.RUnlock()
+			if config.Logger.V(logger.ErrorLevel) {
+				config.Logger.Errorf(config.Context, "grpc handler got error: %s", err)
+			}
 		}
 	}()

-	serviceName, methodName, err := serviceMethod(fullMethod)
-	if err != nil {
-		return status.New(codes.InvalidArgument, err.Error()).Err()
-	}
-
 	if g.wg != nil {
 		g.wg.Add(1)
 		defer g.wg.Done()
 	}

-	// get grpc metadata
-	gmd, ok := gmetadata.FromIncomingContext(stream.Context())
+	fullMethod, ok := grpc.MethodFromServerStream(stream)
 	if !ok {
-		gmd = gmetadata.MD{}
+		return status.Errorf(codes.Internal, "method does not exist in context")
 	}

-	md := metadata.New(len(gmd))
+	serviceName, methodName, err := serviceMethod(fullMethod)
+	if err != nil {
+		return status.New(codes.InvalidArgument, err.Error()).Err()
+	}
+
+	// get grpc metadata
+	gmd, ok := metadata.FromIncomingContext(stream.Context())
+	if !ok {
+		gmd = metadata.MD{}
+	}
+
+	// copy the metadata to go-micro.metadata
+	md := meta.Metadata{}
 	for k, v := range gmd {
-		md.Set(k, strings.Join(v, ", "))
+		md[k] = strings.Join(v, ", ")
 	}
-	md.Set("Path", fullMethod)

-	var td string
 	// timeout for server deadline
-	if v, ok := md.Get("timeout"); ok {
-		md.Del("timeout")
-		td = v
-	}
-	if v, ok := md.Get("Grpc-Timeout"); ok {
-		md.Del("Grpc-Timeout")
-		td = v[:len(v)-1]
-		switch v[len(v)-1:] {
-		case "S":
-			td += "s"
-		case "M":
-			td += "m"
-		case "H":
-			td += "h"
-		case "m":
-			td += "ms"
-		case "u":
-			td += "us"
-		case "n":
-			td += "ns"
-		}
-	}
+	to := md["timeout"]

 	// get content type
-	ct := DefaultContentType
+	ct := defaultContentType

-	if ctype, ok := md.Get("content-type"); ok {
+	if ctype, ok := md["x-content-type"]; ok {
 		ct = ctype
-	} else if ctype, ok := md.Get("x-content-type"); ok {
+	}
+	if ctype, ok := md["content-type"]; ok {
 		ct = ctype
-		md.Del("x-content-type")
 	}

+	delete(md, "x-content-type")
+	delete(md, "timeout")
+
 	// create new context
-	ctx := metadata.NewIncomingContext(stream.Context(), md)
+	ctx := meta.NewContext(stream.Context(), md)

 	// get peer from context
 	if p, ok := peer.FromContext(stream.Context()); ok {
-		md.Set("Remote", p.Addr.String())
+		md["Remote"] = p.Addr.String()
 		ctx = peer.NewContext(ctx, p)
 	}

 	// set the timeout if we have it
-	if len(td) > 0 {
-		if n, err := strconv.ParseUint(td, 10, 64); err == nil {
+	if len(to) > 0 {
+		if n, err := strconv.ParseUint(to, 10, 64); err == nil {
 			var cancel context.CancelFunc
 			ctx, cancel = context.WithTimeout(ctx, time.Duration(n))
 			defer cancel()
 		}
 	}

+	// process via router
+	if g.opts.Router != nil {
+		cf, err := g.newCodec(ct)
+		if err != nil {
+			return errors.InternalServerError(g.opts.Name, err.Error())
+		}
+
+		// create a client.Request
+		request := &rpcRequest{
+			rw:          &wrapStream{stream},
+			service:     serviceFromMethod(fullMethod),
+			contentType: ct,
+			method:      fmt.Sprintf("%s.%s", serviceName, methodName),
+			endpoint:    fmt.Sprintf("%s.%s", serviceName, methodName),
+			target:      g.opts.Name,
+			codec:       cf,
+			stream:      true,
+		}
+
+		response := &rpcResponse{
+			method:   fmt.Sprintf("%s.%s", serviceName, methodName),
+			endpoint: fmt.Sprintf("%s.%s", serviceName, methodName),
+			target:   g.opts.Name,
+			rw:       &wrapStream{stream},
+			header:   make(map[string]string),
+			codec:    cf,
+		}
+
+		// create a wrapped function
+		handler := func(ctx context.Context, req server.Request, rsp interface{}) error {
+			return g.opts.Router.ServeRequest(ctx, req, rsp.(server.Response))
+		}
+
+		// execute the wrapper for it
+		for i := len(g.opts.HdlrWrappers); i > 0; i-- {
+			handler = g.opts.HdlrWrappers[i-1](handler)
+		}
+
+		r := grpcRouter{h: handler}
+
+		// serve the actual request using the request router
+		if err := r.ServeRequest(ctx, request, response); err != nil {
+			if _, ok := status.FromError(err); ok {
+				return err
+			}
+			return status.Errorf(codes.Internal, err.Error())
+		}
+
+		return nil
+	}
+
+	// process the standard request flow
 	g.rpc.mu.RLock()
 	svc := g.rpc.serviceMap[serviceName]
 	g.rpc.mu.RUnlock()

-	/*
 	if svc == nil && g.reflection && methodName == "ServerReflectionInfo" {
-			rfl := &ServerReflection{srv: g.srv, s: &serverReflectionServer{s: g.srv}}
+		rfl := &grpcServerReflection{srv: g.srv, s: &serverReflectionServer{s: g.srv}}
 		svc = &service{}
 		svc.typ = reflect.TypeOf(rfl)
 		svc.rcvr = reflect.ValueOf(rfl)
@ -317,35 +346,27 @@ func (g *Server) handler(srv interface{}, stream grpc.ServerStream) error {
 			g.rpc.mu.Unlock()
 		}
 	}
-	*/

 	if svc == nil {
-		if g.unknownHandler != nil {
-			return g.unknownHandler(srv, stream)
-		}
 		return status.New(codes.Unimplemented, fmt.Sprintf("unknown service %s", serviceName)).Err()
 	}

 	mtype := svc.method[methodName]
 	if mtype == nil {
-		if g.unknownHandler != nil {
-			return g.unknownHandler(srv, stream)
-		}
-		return status.New(codes.Unimplemented, fmt.Sprintf("unknown service method %s.%s", serviceName, methodName)).Err()
+		return status.New(codes.Unimplemented, fmt.Sprintf("unknown service %s.%s", serviceName, methodName)).Err()
 	}

 	// process unary
 	if !mtype.stream {
-		return g.processRequest(ctx, stream, svc, mtype, ct)
+		return g.processRequest(stream, svc, mtype, ct, ctx)
 	}

 	// process stream
-	return g.processStream(ctx, stream, svc, mtype, ct)
+	return g.processStream(stream, svc, mtype, ct, ctx)
 }

-func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, service *service, mtype *methodType, ct string) error {
-	// for {
-	var err error
+func (g *grpcServer) processRequest(stream grpc.ServerStream, service *service, mtype *methodType, ct string, ctx context.Context) error {
+	for {
 		var argv, replyv reflect.Value

 		// Decode the argument value.
@ -358,7 +379,7 @@ func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, s
 		}

 		// Unmarshal request
-	if err = stream.RecvMsg(argv.Interface()); err != nil {
+		if err := stream.RecvMsg(argv.Interface()); err != nil {
 			return err
 		}

@ -372,17 +393,26 @@ func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, s
 		function := mtype.method.Func
 		var returnValues []reflect.Value

+		cf, err := g.newCodec(ct)
+		if err != nil {
+			return errors.InternalServerError(g.opts.Name, err.Error())
+		}
+		b, err := cf.Marshal(argv.Interface())
+		if err != nil {
+			return err
+		}
+
 		// create a client.Request
 		r := &rpcRequest{
 			service:     g.opts.Name,
 			contentType: ct,
 			method:      fmt.Sprintf("%s.%s", service.name, mtype.method.Name),
-		endpoint:    fmt.Sprintf("%s.%s", service.name, mtype.method.Name),
+			body:        b,
 			payload:     argv.Interface(),
 		}
 		// define the handler func
 		fn := func(ctx context.Context, req server.Request, rsp interface{}) (err error) {
-		returnValues = function.Call([]reflect.Value{service.rcvr, mtype.prepareContext(ctx), argv, reflect.ValueOf(rsp)})
+			returnValues = function.Call([]reflect.Value{service.rcvr, mtype.prepareContext(ctx), reflect.ValueOf(argv.Interface()), reflect.ValueOf(rsp)})

 			// The return value for the method is an error.
 			if rerr := returnValues[0].Interface(); rerr != nil {
@ -400,19 +430,21 @@ func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, s
 		statusCode := codes.OK
 		statusDesc := ""
 		// execute the handler
-	appErr := fn(ctx, r, replyv.Interface())
-	if outmd, ok := metadata.FromOutgoingContext(ctx); ok {
-		if err = stream.SendHeader(gmetadata.New(outmd)); err != nil {
-			return err
-		}
-	}
-	if appErr != nil {
+		if appErr := fn(ctx, r, replyv.Interface()); appErr != nil {
 			var errStatus *status.Status
 			switch verr := appErr.(type) {
 			case *errors.Error:
 				statusCode = microError(verr)
 				statusDesc = verr.Error()
 				errStatus = status.New(statusCode, statusDesc)
+			case oldproto.Message:
+				// user defined error that proto based we can attach it to grpc status
+				statusCode = convertCode(appErr)
+				statusDesc = appErr.Error()
+				errStatus, err = status.New(statusCode, statusDesc).WithDetails(verr)
+				if err != nil {
+					return err
+				}
 			case proto.Message:
 				// user defined error that proto based we can attach it to grpc status
 				statusCode = convertCode(appErr)
@ -421,8 +453,6 @@ func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, s
 				if err != nil {
 					return err
 				}
-		case (interface{ GRPCStatus() *status.Status }):
-			errStatus = verr.GRPCStatus()
 			default:
 				g.RLock()
 				config := g.opts
@ -445,15 +475,57 @@ func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, s

 		return status.New(statusCode, statusDesc).Err()
 	}
+}

-func (g *Server) processStream(ctx context.Context, stream grpc.ServerStream, service *service, mtype *methodType, ct string) error {
+type reflectStream struct {
+	stream server.Stream
+}
+
+func (s *reflectStream) Send(rsp *grpcreflect.ServerReflectionResponse) error {
+	return s.stream.Send(rsp)
+}
+
+func (s *reflectStream) Recv() (*grpcreflect.ServerReflectionRequest, error) {
+	req := &grpcreflect.ServerReflectionRequest{}
+	err := s.stream.Recv(req)
+	return req, err
+}
+
+func (s *reflectStream) SetHeader(metadata.MD) error {
+	return nil
+}
+
+func (s *reflectStream) SendHeader(metadata.MD) error {
+	return nil
+}
+
+func (s *reflectStream) SetTrailer(metadata.MD) {
+
+}
+
+func (s *reflectStream) Context() context.Context {
+	return s.stream.Context()
+}
+
+func (s *reflectStream) SendMsg(m interface{}) error {
+	return s.stream.Send(m)
+}
+
+func (s *reflectStream) RecvMsg(m interface{}) error {
+	return s.stream.Recv(m)
+}
+
+func (g *grpcServerReflection) ServerReflectionInfo(ctx context.Context, stream server.Stream) error {
+	return g.s.ServerReflectionInfo(&reflectStream{stream})
+}
+
+func (g *grpcServer) processStream(stream grpc.ServerStream, service *service, mtype *methodType, ct string, ctx context.Context) error {
 	opts := g.opts

 	r := &rpcRequest{
 		service:     opts.Name,
 		contentType: ct,
 		method:      fmt.Sprintf("%s.%s", service.name, mtype.method.Name),
-		endpoint:    fmt.Sprintf("%s.%s", service.name, mtype.method.Name),
 		stream:      true,
 	}

@ -482,13 +554,7 @@ func (g *Server) processStream(ctx context.Context, stream grpc.ServerStream, se
 	statusCode := codes.OK
 	statusDesc := ""

-	appErr := fn(ctx, r, ss)
-	if outmd, ok := metadata.FromOutgoingContext(ctx); ok {
-		if err := stream.SendHeader(gmetadata.New(outmd)); err != nil {
-			return err
-		}
-	}
-	if appErr != nil {
+	if appErr := fn(ctx, r, ss); appErr != nil {
 		var err error
 		var errStatus *status.Status
 		switch verr := appErr.(type) {
@ -496,6 +562,14 @@ func (g *Server) processStream(ctx context.Context, stream grpc.ServerStream, se
 			statusCode = microError(verr)
 			statusDesc = verr.Error()
 			errStatus = status.New(statusCode, statusDesc)
+		case oldproto.Message:
+			// user defined error that proto based we can attach it to grpc status
+			statusCode = convertCode(appErr)
+			statusDesc = appErr.Error()
+			errStatus, err = status.New(statusCode, statusDesc).WithDetails(verr)
+			if err != nil {
+				return err
+			}
 		case proto.Message:
 			// user defined error that proto based we can attach it to grpc status
 			statusCode = convertCode(appErr)
@ -520,14 +594,10 @@ func (g *Server) processStream(ctx context.Context, stream grpc.ServerStream, se
 	return status.New(statusCode, statusDesc).Err()
 }

-func (g *Server) newCodec(ct string) (codec.Codec, error) {
+func (g *grpcServer) newCodec(ct string) (codec.Codec, error) {
 	g.RLock()
 	defer g.RUnlock()

-	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
-		ct = ct[:idx]
-	}
-
 	if c, ok := g.opts.Codecs[ct]; ok {
 		return c, nil
 	}
@ -535,7 +605,7 @@ func (g *Server) newCodec(ct string) (codec.Codec, error) {
 	return nil, codec.ErrUnknownContentType
 }

-func (g *Server) Options() server.Options {
+func (g *grpcServer) Options() server.Options {
 	g.RLock()
 	opts := g.opts
 	g.RUnlock()
@ -543,15 +613,15 @@ func (g *Server) Options() server.Options {
 	return opts
 }

-func (g *Server) Init(opts ...server.Option) error {
+func (g *grpcServer) Init(opts ...server.Option) error {
 	return g.configure(opts...)
 }

-func (g *Server) NewHandler(h interface{}, opts ...server.HandlerOption) server.Handler {
-	return newRPCHandler(h, opts...)
+func (g *grpcServer) NewHandler(h interface{}, opts ...server.HandlerOption) server.Handler {
+	return newRpcHandler(h, opts...)
 }

-func (g *Server) Handle(h server.Handler) error {
+func (g *grpcServer) Handle(h server.Handler) error {
 	if err := g.rpc.register(h.Handler()); err != nil {
 		return err
 	}
@ -560,11 +630,11 @@ func (g *Server) Handle(h server.Handler) error {
 	return nil
 }

-func (g *Server) NewSubscriber(topic string, sb interface{}, opts ...server.SubscriberOption) server.Subscriber {
+func (g *grpcServer) NewSubscriber(topic string, sb interface{}, opts ...server.SubscriberOption) server.Subscriber {
 	return newSubscriber(topic, sb, opts...)
 }

-func (g *Server) Subscribe(sb server.Subscriber) error {
+func (g *grpcServer) Subscribe(sb server.Subscriber) error {
 	sub, ok := sb.(*subscriber)
 	if !ok {
 		return fmt.Errorf("invalid subscriber: expected *subscriber")
@ -588,7 +658,7 @@ func (g *Server) Subscribe(sb server.Subscriber) error {
 	return nil
 }

-func (g *Server) Register() error {
+func (g *grpcServer) Register() error {
 	g.RLock()
 	rsvc := g.rsvc
 	config := g.opts
@ -609,19 +679,23 @@ func (g *Server) Register() error {

 	g.RLock()
 	// Maps are ordered randomly, sort the keys for consistency
-	handlerList := make([]string, 0, len(g.handlers))
-	for n := range g.handlers {
+	var handlerList []string
+	for n, e := range g.handlers {
 		// Only advertise non internal handlers
+		if !e.Options().Internal {
 			handlerList = append(handlerList, n)
 		}
+	}

 	sort.Strings(handlerList)

-	subscriberList := make([]*subscriber, 0, len(g.subscribers))
+	var subscriberList []*subscriber
 	for e := range g.subscribers {
 		// Only advertise non internal subscribers
+		if !e.Options().Internal {
 			subscriberList = append(subscriberList, e)
 		}
+	}
 	sort.Slice(subscriberList, func(i, j int) bool {
 		return subscriberList[i].topic > subscriberList[j].topic
 	})
@ -636,7 +710,7 @@ func (g *Server) Register() error {
 	g.RUnlock()

 	service.Nodes[0].Metadata["protocol"] = "grpc"
-	service.Nodes[0].Metadata["transport"] = service.Nodes[0].Metadata["protocol"]
+	service.Nodes[0].Metadata["transport"] = "grpc"
 	service.Endpoints = endpoints

 	g.RLock()
@ -645,7 +719,7 @@ func (g *Server) 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)
 		}
 	}

@ -662,13 +736,37 @@ func (g *Server) Register() error {
 	g.Lock()
 	defer g.Unlock()

+	for sb := range g.subscribers {
+		handler := g.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))
+
+		if config.Logger.V(logger.InfoLevel) {
+			config.Logger.Infof(config.Context, "Subscribing to topic: %s", sb.Topic())
+		}
+		sub, err := config.Broker.Subscribe(subCtx, sb.Topic(), handler, opts...)
+		if err != nil {
+			return err
+		}
+		g.subscribers[sb] = []broker.Subscriber{sub}
+	}
+
 	g.registered = true
 	g.rsvc = service

 	return nil
 }

-func (g *Server) Deregister() error {
+func (g *grpcServer) Deregister() error {
 	var err error

 	g.RLock()
@ -681,7 +779,7 @@ func (g *Server) 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 {
@ -722,7 +820,7 @@ func (g *Server) Deregister() error {
 	return nil
 }

-func (g *Server) Start() error {
+func (g *grpcServer) Start() error {
 	g.RLock()
 	if g.started {
 		g.RUnlock()
@ -732,13 +830,18 @@ func (g *Server) Start() error {

 	config := g.Options()

+	for _, k := range config.Codecs {
+		encoding.RegisterCodec(&wrapMicroCodec{k})
+	}
+
 	// micro: config.Transport.Listen(config.Address)
 	var ts net.Listener
-	var err error

 	if l := config.Listener; l != nil {
 		ts = l
 	} else {
+		var err error
+
 		// check the tls config for secure connect
 		if tc := config.TLSConfig; tc != nil {
 			ts, err = tls.Listen("tcp", config.Address, tc)
@ -768,7 +871,7 @@ func (g *Server) Start() error {
 	// only connect if we're subscribed
 	if len(g.subscribers) > 0 {
 		// connect to the broker
-		if err = config.Broker.Connect(config.Context); err != nil {
+		if err := config.Broker.Connect(config.Context); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
 				config.Logger.Errorf(config.Context, "Broker [%s] connect error: %v", config.Broker.String(), err)
 			}
@ -781,31 +884,26 @@ func (g *Server) Start() error {
 	}

 	// use RegisterCheck func before register
-	// nolint: nestif
-	if err = g.opts.RegisterCheck(config.Context); err != nil {
+	if err := g.opts.RegisterCheck(config.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 {
 		// announce self to the world
-		if err = g.Register(); err != nil {
+		if err := g.Register(); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
 				config.Logger.Errorf(config.Context, "Server register error: %v", err)
 			}
 		}
 	}

-	if err = g.subscribe(); err != nil {
-		return err
-	}
-
 	// micro: go ts.Accept(s.accept)
 	go func() {
-		if err = g.srv.Serve(ts); err != nil {
+		if err := g.srv.Serve(ts); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
 				config.Logger.Errorf(config.Context, "gRPC Server start error: %v", err)
 			}
-			if err = g.Stop(); err != nil {
+			if err := g.Stop(); err != nil {
 				if config.Logger.V(logger.ErrorLevel) {
 					config.Logger.Errorf(config.Context, "gRPC Server stop error: %v", err)
 				}
@ -834,26 +932,25 @@ func (g *Server) Start() error {
 				registered := g.registered
 				g.RUnlock()
 				rerr := g.opts.RegisterCheck(g.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 = g.Deregister(); err != nil {
+					if err := g.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 = g.Register(); err != nil {
+				if err := g.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)
 					}
 				}
 			// wait for exit
@ -863,9 +960,9 @@ func (g *Server) Start() error {
 		}

 		// deregister self
-		if err = g.Deregister(); err != nil {
+		if err := g.Deregister(); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Errorf(config.Context, "Server deregister error: %v", err)
+				config.Logger.Errorf(config.Context, "Server deregister error: ", err)
 			}
 		}

@ -884,7 +981,7 @@ func (g *Server) Start() error {

 		select {
 		case <-exit:
-		case <-time.After(g.opts.GracefulTimeout):
+		case <-time.After(time.Second):
 			g.srv.Stop()
 		}

@ -895,7 +992,7 @@ func (g *Server) Start() error {
 			config.Logger.Infof(config.Context, "Broker [%s] Disconnected from %s", config.Broker.String(), config.Broker.Address())
 		}
 		// disconnect broker
-		if err = config.Broker.Disconnect(config.Context); err != nil {
+		if err := config.Broker.Disconnect(config.Context); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
 				config.Logger.Errorf(config.Context, "Broker [%s] disconnect error: %v", config.Broker.String(), err)
 			}
@ -910,38 +1007,7 @@ func (g *Server) Start() error {
 	return nil
 }

-func (g *Server) subscribe() error {
-	config := g.opts
-
-	for sb := range g.subscribers {
-		handler := g.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))
-
-		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Infof(config.Context, "Subscribing to topic: %s", sb.Topic())
-		}
-		sub, err := config.Broker.Subscribe(subCtx, sb.Topic(), handler, opts...)
-		if err != nil {
-			return err
-		}
-		g.subscribers[sb] = []broker.Subscriber{sub}
-	}
-
-	return nil
-}
-
-func (g *Server) Stop() error {
+func (g *grpcServer) Stop() error {
 	g.RLock()
 	if !g.started {
 		g.RUnlock()
@ -961,18 +1027,14 @@ func (g *Server) Stop() error {
 	return err
 }

-func (g *Server) String() string {
+func (g *grpcServer) String() string {
 	return "grpc"
 }

-func (g *Server) Name() string {
+func (g *grpcServer) Name() string {
 	return g.opts.Name
 }

-func (g *Server) GRPCServer() *grpc.Server {
-	return g.srv
-}
-
-func NewServer(opts ...server.Option) *Server {
-	return newServer(opts...)
+func NewServer(opts ...server.Option) server.Server {
+	return newGRPCServer(opts...)
 }
--- a/handler.go
+++ b/handler.go
@ -3,18 +3,18 @@ package grpc
 import (
 	"reflect"

-	"go.unistack.org/micro/v3/register"
-	"go.unistack.org/micro/v3/server"
+	"github.com/unistack-org/micro/v3/register"
+	"github.com/unistack-org/micro/v3/server"
 )

 type rpcHandler struct {
-	opts      server.HandlerOptions
-	handler   interface{}
 	name      string
+	handler   interface{}
 	endpoints []*register.Endpoint
+	opts      server.HandlerOptions
 }

-func newRPCHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
+func newRpcHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
 	options := server.NewHandlerOptions(opts...)

 	typ := reflect.TypeOf(handler)
--- a/options.go
+++ b/options.go
@ -2,19 +2,18 @@ package grpc

 import (
 	"context"
+	"crypto/tls"

-	"go.unistack.org/micro/v3/server"
+	"github.com/unistack-org/micro/v3/server"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )

-type (
-	codecsKey                struct{}
-	grpcOptions              struct{}
-	maxMsgSizeKey            struct{}
-	reflectionKey            struct{}
-	unknownServiceHandlerKey struct{}
-)
+type codecsKey struct{}
+type grpcOptions struct{}
+type maxMsgSizeKey struct{}
+type tlsAuth struct{}
+type reflectionKey struct{}

 // gRPC Codec to be used to encode/decode requests for a given content type
 func Codec(contentType string, c encoding.Codec) server.Option {
@ -31,24 +30,25 @@ func Codec(contentType string, c encoding.Codec) server.Option {
 	}
 }

+// AuthTLS should be used to setup a secure authentication using TLS
+func AuthTLS(t *tls.Config) server.Option {
+	return setServerOption(tlsAuth{}, t)
+}
+
 // Options to be used to configure gRPC options
 func Options(opts ...grpc.ServerOption) server.Option {
-	return server.SetOption(grpcOptions{}, opts)
+	return setServerOption(grpcOptions{}, opts)
 }

 //
 // MaxMsgSize set the maximum message in bytes the server can receive and
 // send.  Default maximum message size is 4 MB.
+//
 func MaxMsgSize(s int) server.Option {
-	return server.SetOption(maxMsgSizeKey{}, s)
+	return setServerOption(maxMsgSizeKey{}, s)
 }

 // Reflection enables reflection support in grpc server
 func Reflection(b bool) server.Option {
-	return server.SetOption(reflectionKey{}, b)
-}
-
-// UnknownServiceHandler enables support for all services
-func UnknownServiceHandler(h grpc.StreamHandler) server.Option {
-	return server.SetOption(unknownServiceHandlerKey{}, h)
+	return setServerOption(reflectionKey{}, b)
 }
--- a/quic/quic_net.go
+++ b/quic/quic_net.go
@ -1,166 +0,0 @@
-// grpc over quic mostly based on https://github.com/sssgun/grpc-quic
-// copyright sssgun with MIT license
-package grpcquic // import "go.unistack.org/micro-server-grpc/v3/quic"
-
-import (
-	"context"
-	"crypto/tls"
-	"net"
-	"time"
-
-	quic "github.com/quic-go/quic-go"
-)
-
-///////////////////////////////////////////////////////////////////////////////
-// Connection
-
-var _ net.Conn = (*Conn)(nil)
-
-type Conn struct {
-	conn   quic.Connection
-	stream quic.Stream
-}
-
-func NewConn(conn quic.Connection) (net.Conn, error) {
-	stream, err := conn.OpenStreamSync(context.Background())
-	if err != nil {
-		return nil, err
-	}
-
-	return &Conn{conn, stream}, nil
-}
-
-// Read reads data from the connection.
-// Read can be made to time out and return an Error with Timeout() == true
-// after a fixed time limit; see SetDeadline and SetReadDeadline.
-func (c *Conn) Read(b []byte) (n int, err error) {
-	return c.stream.Read(b)
-}
-
-// Write writes data to the connection.
-// Write can be made to time out and return an Error with Timeout() == true
-// after a fixed time limit; see SetDeadline and SetWriteDeadline.
-func (c *Conn) Write(b []byte) (n int, err error) {
-	return c.stream.Write(b)
-}
-
-// Close closes the connection.
-// Any blocked Read or Write operations will be unblocked and return errors.
-func (c *Conn) Close() error {
-	// @TODO: log this
-	c.stream.Close()
-
-	return c.conn.CloseWithError(0, "")
-}
-
-// LocalAddr returns the local network address.
-func (c *Conn) LocalAddr() net.Addr {
-	return c.conn.LocalAddr()
-}
-
-// RemoteAddr returns the remote network address.
-func (c *Conn) RemoteAddr() net.Addr {
-	return c.conn.RemoteAddr()
-}
-
-// SetDeadline sets the read and write deadlines associated
-// with the connection. It is equivalent to calling both
-// SetReadDeadline and SetWriteDeadline.
-//
-// A deadline is an absolute time after which I/O operations
-// fail with a timeout (see type Error) instead of
-// blocking. The deadline applies to all future and pending
-// I/O, not just the immediately following call to Read or
-// Write. After a deadline has been exceeded, the connection
-// can be refreshed by setting a deadline in the future.
-//
-// An idle timeout can be implemented by repeatedly extending
-// the deadline after successful Read or Write calls.
-//
-// A zero value for t means I/O operations will not time out.
-func (c *Conn) SetDeadline(t time.Time) error {
-	return c.stream.SetDeadline(t)
-}
-
-// SetReadDeadline sets the deadline for future Read calls
-// and any currently-blocked Read call.
-// A zero value for t means Read will not time out.
-func (c *Conn) SetReadDeadline(t time.Time) error {
-	return c.stream.SetReadDeadline(t)
-}
-
-// SetWriteDeadline sets the deadline for future Write calls
-// and any currently-blocked Write call.
-// Even if write times out, it may return n > 0, indicating that
-// some of the data was successfully written.
-// A zero value for t means Write will not time out.
-func (c *Conn) SetWriteDeadline(t time.Time) error {
-	return c.stream.SetWriteDeadline(t)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Listener
-
-var _ net.Listener = (*Listener)(nil)
-
-type Listener struct {
-	ql quic.Listener
-}
-
-func Listen(ql quic.Listener) net.Listener {
-	return &Listener{ql}
-}
-
-// Accept waits for and returns the next connection to the listener.
-func (l *Listener) Accept() (net.Conn, error) {
-	sess, err := l.ql.Accept(context.Background())
-	if err != nil {
-		return nil, err
-	}
-
-	stream, err := sess.AcceptStream(context.Background())
-	if err != nil {
-		return nil, err
-	}
-
-	return &Conn{sess, stream}, nil
-}
-
-// Close closes the listener.
-// Any blocked Accept operations will be unblocked and return errors.
-func (l *Listener) Close() error {
-	return l.ql.Close()
-}
-
-// Addr returns the listener's network address.
-func (l *Listener) Addr() net.Addr {
-	return l.ql.Addr()
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Dialer
-
-var QuicConfig = &quic.Config{
-	KeepAlivePeriod: 10 * time.Second,
-}
-
-func NewPacketConn(addr string) (net.PacketConn, error) {
-	// create a packet conn for outgoing connections
-	udpAddr, err := net.ResolveUDPAddr("udp", addr)
-	if err != nil {
-		return nil, err
-	}
-
-	return net.ListenUDP("udp", udpAddr)
-}
-
-func NewQuicDialer(tlsConf *tls.Config) func(context.Context, string) (net.Conn, error) {
-	return func(ctx context.Context, target string) (net.Conn, error) {
-		sess, err := quic.DialAddr(ctx, target, tlsConf, QuicConfig)
-		if err != nil {
-			return nil, err
-		}
-
-		return NewConn(sess)
-	}
-}
--- a/quic/quic_transport.go
+++ b/quic/quic_transport.go
@ -1,117 +0,0 @@
-// grpc over quic mostly based on https://github.com/sssgun/grpc-quic
-// copyright sssgun with MIT license
-package grpcquic
-
-import (
-	"context"
-	"crypto/tls"
-	"net"
-
-	"google.golang.org/grpc/credentials"
-)
-
-var _ credentials.AuthInfo = (*Info)(nil)
-
-// Info contains the auth information
-type Info struct {
-	conn *Conn
-}
-
-func NewInfo(c *Conn) *Info {
-	return &Info{c}
-}
-
-// AuthType returns the type of Info as a string.
-func (i *Info) AuthType() string {
-	return "quic-tls"
-}
-
-func (i *Info) Conn() net.Conn {
-	return i.conn
-}
-
-var _ credentials.TransportCredentials = (*Credentials)(nil)
-
-type Credentials struct {
-	tlsConfig        *tls.Config
-	isQuicConnection bool
-	serverName       string
-
-	grpcCreds credentials.TransportCredentials
-}
-
-func NewCredentials(tlsConfig *tls.Config) credentials.TransportCredentials {
-	grpcCreds := credentials.NewTLS(tlsConfig)
-	return &Credentials{
-		grpcCreds: grpcCreds,
-		tlsConfig: tlsConfig,
-	}
-}
-
-// ClientHandshake does the authentication handshake specified by the corresponding
-// authentication protocol on rawConn for clients. It returns the authenticated
-// connection and the corresponding auth information about the connection.
-// Implementations must use the provided context to implement timely cancellation.
-// gRPC will try to reconnect if the error returned is a temporary error
-// (io.EOF, context.DeadlineExceeded or err.Temporary() == true).
-// If the returned error is a wrapper error, implementations should make sure that
-// the error implements Temporary() to have the correct retry behaviors.
-//
-// If the returned net.Conn is closed, it MUST close the net.Conn provided.
-func (pt *Credentials) ClientHandshake(ctx context.Context, authority string, conn net.Conn) (net.Conn, credentials.AuthInfo, error) {
-	if c, ok := conn.(*Conn); ok {
-		pt.isQuicConnection = true
-		return conn, NewInfo(c), nil
-	}
-
-	return pt.grpcCreds.ClientHandshake(ctx, authority, conn)
-}
-
-// ServerHandshake does the authentication handshake for servers. It returns
-// the authenticated connection and the corresponding auth information about
-// the connection.
-//
-// If the returned net.Conn is closed, it MUST close the net.Conn provided.
-func (pt *Credentials) ServerHandshake(conn net.Conn) (net.Conn, credentials.AuthInfo, error) {
-	if c, ok := conn.(*Conn); ok {
-		pt.isQuicConnection = true
-		ainfo := NewInfo(c)
-		return conn, ainfo, nil
-	}
-
-	return pt.grpcCreds.ServerHandshake(conn)
-}
-
-// Info provides the ProtocolInfo of this Credentials.
-func (pt *Credentials) Info() credentials.ProtocolInfo {
-	if pt.isQuicConnection {
-		return credentials.ProtocolInfo{
-			// ProtocolVersion is the gRPC wire protocol version.
-			ProtocolVersion: "/quic/1.0.0",
-			// SecurityProtocol is the security protocol in use.
-			SecurityProtocol: "quic-tls",
-			// SecurityVersion is the security protocol version.
-			// SecurityVersion: "1.2.0",
-			// ServerName is the user-configured server name.
-			ServerName: pt.serverName,
-		}
-	}
-
-	return pt.grpcCreds.Info()
-}
-
-// Clone makes a copy of this Credentials.
-func (pt *Credentials) Clone() credentials.TransportCredentials {
-	return &Credentials{
-		tlsConfig: pt.tlsConfig.Clone(),
-		grpcCreds: pt.grpcCreds.Clone(),
-	}
-}
-
-// OverrideServerName overrides the server name used to verify the hostname on the returned certificates from the server.
-// gRPC internals also use it to override the virtual hosting name if it is set.
-// It must be called before dialing. Currently, this is only used by grpclb.
-func (pt *Credentials) OverrideServerName(name string) error {
-	pt.serverName = name
-	return pt.grpcCreds.OverrideServerName(name)
-}
--- a/reflection.go
+++ b/reflection.go
@ -1,5 +1,3 @@
-// +build ignore
-
 /*
 *
 * Copyright 2016 gRPC authors.
--- a/request.go
+++ b/request.go
@ -3,34 +3,31 @@ package grpc
 import (
 	"io"

-	"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{}
+	"github.com/unistack-org/micro/v3/codec"
+	"github.com/unistack-org/micro/v3/metadata"
 )

 type rpcRequest struct {
 	rw          io.ReadWriter
-	payload     interface{}
-	codec       codec.Codec
-	header      metadata.Metadata
+	service     string
 	method      string
 	endpoint    string
+	target      string
 	contentType string
-	service     string
+	codec       codec.Codec
+	header      metadata.Metadata
+	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 {
@ -46,7 +43,7 @@ func (r *rpcRequest) Method() string {
 }

 func (r *rpcRequest) Endpoint() string {
-	return r.endpoint
+	return r.method
 }

 func (r *rpcRequest) Codec() codec.Codec {
@ -81,7 +78,7 @@ func (r *rpcMessage) Topic() string {
 	return r.topic
 }

-func (r *rpcMessage) Body() interface{} {
+func (r *rpcMessage) Payload() interface{} {
 	return r.payload
 }

@ -89,6 +86,10 @@ func (r *rpcMessage) Header() metadata.Metadata {
 	return r.header
 }

+func (r *rpcMessage) Body() []byte {
+	return r.body
+}
+
 func (r *rpcMessage) Codec() codec.Codec {
 	return r.codec
 }
--- a/response.go
+++ b/response.go
@ -3,17 +3,18 @@ package grpc
 import (
 	"io"

-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/server"
+	"github.com/unistack-org/micro/v3/codec"
+	"github.com/unistack-org/micro/v3/metadata"
 )

-var _ server.Response = &rpcResponse{}
-
 type rpcResponse struct {
 	rw       io.ReadWriter
 	header   metadata.Metadata
 	codec    codec.Codec
+	endpoint string
+	service  string
+	method   string
+	target   string
 }

 func (r *rpcResponse) Codec() codec.Codec {
--- a/server.go
+++ b/server.go
@ -14,35 +14,37 @@ import (
 	"unicode"
 	"unicode/utf8"

-	"go.unistack.org/micro/v3/server"
+	"github.com/unistack-org/micro/v3/server"
 )

+var (
 	// Precompute the reflect type for error. Can't use error directly
 	// because Typeof takes an empty interface value. This is annoying.
-var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
+	typeOfError = reflect.TypeOf((*error)(nil)).Elem()
+)

 type methodType struct {
+	method      reflect.Method
 	ArgType     reflect.Type
 	ReplyType   reflect.Type
 	ContextType reflect.Type
-	method      reflect.Method
 	stream      bool
 }

-// type reflectionType func(context.Context, server.Stream) error
+type reflectionType func(context.Context, server.Stream) error

 type service struct {
-	typ    reflect.Type
-	method map[string]*methodType
-	rcvr   reflect.Value
-	name   string
+	name   string                 // name of service
+	rcvr   reflect.Value          // receiver of methods for the service
+	typ    reflect.Type           // type of the receiver
+	method map[string]*methodType // registered methods
 }

 // server represents an RPC Server.
 type rServer struct {
+	mu         sync.RWMutex // protects the serviceMap
 	serviceMap map[string]*service
-	mu         sync.RWMutex
-	// reflection bool
+	reflection bool
 }

 // Is this an exported - upper case - name?
@ -89,14 +91,15 @@ 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())
 	}

-	switch stream {
-	case true:
+	if stream {
 		// 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)
 		}
-	default:
+	} else {
+		// if not stream check the replyType
+
 		// First arg need not be a pointer.
 		if !isExportedOrBuiltinType(argType) {
 			return nil, fmt.Errorf("%v argument type not exported: %v", mname, argType)
--- a/stream.go
+++ b/stream.go
@ -3,7 +3,7 @@ package grpc
 import (
 	"context"

-	"go.unistack.org/micro/v3/server"
+	"github.com/unistack-org/micro/v3/server"
 	"google.golang.org/grpc"
 )

--- a/subscriber.go
+++ b/subscriber.go
@ -4,18 +4,25 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"runtime/debug"
 	"strings"

-	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/register"
-	"go.unistack.org/micro/v3/server"
+	"github.com/unistack-org/micro/v3/broker"
+	"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"
+)
+
+const (
+	subSig = "func(context.Context, interface{}) error"
 )

 type handler struct {
+	method  reflect.Value
 	reqType reflect.Type
 	ctxType reflect.Type
-	method  reflect.Value
 }

 type subscriber struct {
@ -99,8 +106,17 @@ func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOptio
 	}
 }

-func (g *Server) createSubHandler(sb *subscriber, opts server.Options) broker.Handler {
+func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broker.Handler {
 	return func(p broker.Event) (err error) {
+		defer func() {
+			if r := recover(); r != nil {
+				if g.opts.Logger.V(logger.ErrorLevel) {
+					g.opts.Logger.Error(g.opts.Context, "panic recovered: ", r)
+					g.opts.Logger.Error(g.opts.Context, string(debug.Stack()))
+				}
+				err = errors.InternalServerError(g.opts.Name+".subscriber", "panic recovered: %v", r)
+			}
+		}()

 		msg := p.Message()
 		// if we don't have headers, create empty map
@ -110,8 +126,8 @@ func (g *Server) createSubHandler(sb *subscriber, opts server.Options) broker.Ha

 		ct := msg.Header["Content-Type"]
 		if len(ct) == 0 {
-			msg.Header["Content-Type"] = DefaultContentType
-			ct = DefaultContentType
+			msg.Header["Content-Type"] = defaultContentType
+			ct = defaultContentType
 		}
 		cf, err := g.newCodec(ct)
 		if err != nil {
@ -120,13 +136,10 @@ func (g *Server) createSubHandler(sb *subscriber, opts server.Options) broker.Ha

 		hdr := make(map[string]string, len(msg.Header))
 		for k, v := range msg.Header {
-			if k == "Content-Type" {
-				continue
-			}
 			hdr[k] = v
 		}
-
-		ctx := metadata.NewIncomingContext(sb.opts.Context, hdr)
+		delete(hdr, "Content-Type")
+		ctx := metadata.NewContext(sb.opts.Context, hdr)

 		results := make(chan error, len(sb.handlers))

@ -159,7 +172,7 @@ func (g *Server) createSubHandler(sb *subscriber, opts server.Options) broker.Ha
 					vals = append(vals, reflect.ValueOf(ctx))
 				}

-				vals = append(vals, reflect.ValueOf(msg.Body()))
+				vals = append(vals, reflect.ValueOf(msg.Payload()))

 				returnValues := handler.method.Call(vals)
 				if rerr := returnValues[0].Interface(); rerr != nil {
@ -179,13 +192,14 @@ func (g *Server) createSubHandler(sb *subscriber, opts server.Options) broker.Ha
 				if g.wg != nil {
 					defer g.wg.Done()
 				}
-				cerr := fn(ctx, &rpcMessage{
+				err := fn(ctx, &rpcMessage{
 					topic:       sb.topic,
 					contentType: ct,
 					payload:     req.Interface(),
 					header:      msg.Header,
+					body:        msg.Body,
 				})
-				results <- cerr
+				results <- err
 			}()
 		}
 		var errors []string
--- a/util.go
+++ b/util.go
@ -39,7 +39,6 @@ func serviceMethod(m string) (string, string, error) {
 	return parts[0], parts[1], nil
 }

-/*
 // ServiceFromMethod returns the service
 // /service.Foo/Bar => service
 func serviceFromMethod(m string) string {
@ -56,4 +55,3 @@ func serviceFromMethod(m string) string {
 	parts = strings.Split(parts[1], ".")
 	return strings.Join(parts[:len(parts)-1], ".")
 }
-*/