Bump golang.org/x/net from 0.0.0-20220225172249-27dd8689420f to 0.7.0

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220225172249-27dd8689420f to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/commits/v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 00:14:12 +00:00
14 changed files with 142 additions and 372 deletions
--- a/.gitea/ISSUE_TEMPLATE/bug_report.md
+++ b/.gitea/ISSUE_TEMPLATE/bug_report.md
@@ -1,18 +0,0 @@
---
-name: Bug report
-about: For reporting bugs in micro
-title: "[BUG]"
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-
-1. What are you trying to do?
-2. What did you expect to happen?
-3. What happens instead?
-
-**How to reproduce the bug:**
-
-If possible, please include a minimal code snippet here.
--- a/.gitea/ISSUE_TEMPLATE/feature-request---enhancement.md
+++ b/.gitea/ISSUE_TEMPLATE/feature-request---enhancement.md
@@ -1,17 +0,0 @@
---
-name: Feature request / Enhancement
-about: If you have a need not served by micro
-title: "[FEATURE]"
-labels: ''
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.gitea/ISSUE_TEMPLATE/question.md
+++ b/.gitea/ISSUE_TEMPLATE/question.md
@@ -1,8 +0,0 @@
---
-name: Question
-about: Ask a question about micro
-title: ''
-labels: ''
-assignees: ''
-
---
--- a/.gitea/PULL_REQUEST_TEMPLATE.md
+++ b/.gitea/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +0,0 @@
-## Pull Request template
-Please, go through these steps before clicking submit on this PR.
-
-1. Give a descriptive title to your PR.
-2. Provide a description of your changes.
-3. Make sure you have some relevant tests.
-4. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if applicable).
-
-**PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING**
--- a/.gitea/autoapprove.yml
+++ b/.gitea/autoapprove.yml
@@ -1,28 +0,0 @@
-name: "autoapprove"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-  workflow_run:
-    workflows: ["prbuild"]
-    types:
-      - completed
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  autoapprove:
-    runs-on: ubuntu-latest
-    steps:
-      - name: approve
-        run: [ "curl -o tea https://dl.gitea.com/tea/main/tea-main-linux-amd64",
-               "chmod +x ./tea",
-               "./tea login add --name unistack --token ${{ secrets.GITHUB_TOKEN }} --url https://git.unistack.org",
-               "./tea pr --repo ${{ github.event.repository.name }}"
-        ]
-        if: github.actor == 'vtolstov'
-        id: approve
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitea/workflows/job_lint.yml
+++ b/.gitea/workflows/job_lint.yml
@@ -1,29 +0,0 @@
-name: lint
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable' 
-    - name: setup deps
-      run: go get -v ./...
-    - name: run lint
-      uses: https://github.com/golangci/golangci-lint-action@v6
-      with:
-        version: 'latest'
--- a/.gitea/workflows/job_test.yml
+++ b/.gitea/workflows/job_test.yml
@@ -1,34 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup deps
-      run: go get -v ./...
-    - name: run test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
--- a/.gitea/workflows/job_tests.yml
+++ b/.gitea/workflows/job_tests.yml
@@ -1,53 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: checkout tests
-      uses: actions/checkout@v4
-      with:
-        ref: master
-        filter: 'blob:none'
-        repository: unistack-org/micro-tests
-        path: micro-tests
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup go work
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        go work init
-        go work use .
-        go work use micro-tests
-    - name: setup deps
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: go get -v ./...
-    - name: run tests
-      env:
-        INTEGRATION_TESTS: yes
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        cd micro-tests
-        go test -mod readonly -v ./... || true
--- 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/go.mod
+++ b/go.mod
@@ -1,23 +1,8 @@
 module go.unistack.org/micro-server-tcp/v3

-go 1.22.0
-
-toolchain go1.23.4
+go 1.16

 require (
-	go.unistack.org/micro/v3 v3.11.37
-	golang.org/x/net v0.34.0
-)
-
-require (
-	github.com/ash3in/uuidv8 v1.2.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/matoous/go-nanoid v1.5.1 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/grpc v1.69.4 // indirect
-	google.golang.org/protobuf v1.36.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	go.unistack.org/micro/v3 v3.10.14
+	golang.org/x/net v0.7.0
 )
--- a/go.sum
+++ b/go.sum
@@ -1,42 +1,36 @@
-github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
-github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
-github.com/ash3in/uuidv8 v1.2.0 h1:2oogGdtCPwaVtyvPPGin4TfZLtOGE5F+W++E880G6SI=
-github.com/ash3in/uuidv8 v1.2.0/go.mod h1:BnU0wJBxnzdEKmVg4xckBkD+VZuecTFTUP3M0dWgyY4=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4=
-github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
-go.unistack.org/micro/v3 v3.11.37 h1:ZcpnXAYEMcAwmnVb5b7o8/PylGnILxXMHaUlRrPmRI0=
-go.unistack.org/micro/v3 v3.11.37/go.mod h1:POGU5hstnAT9LH70m8FalyQSNi2GfIew71K75JenIZk=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
-google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
-google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
-google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
-google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.unistack.org/micro/v3 v3.10.14 h1:7fgLpwGlCN67twhwtngJDEQvrMkUBDSA5vzZqxIDqNE=
+go.unistack.org/micro/v3 v3.10.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/handler.go
+++ b/handler.go
@@ -3,6 +3,7 @@ package tcp
 import (
 	"net"

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

@@ -13,6 +14,7 @@ type Handler interface {
 type tcpHandler struct {
 	opts       server.HandlerOptions
 	hd         interface{}
+	eps        []*register.Endpoint
 	maxMsgSize int
 }

@@ -24,6 +26,10 @@ func (h *tcpHandler) Handler() interface{} {
 	return h.hd
 }

+func (h *tcpHandler) Endpoints() []*register.Endpoint {
+	return h.eps
+}
+
 func (h *tcpHandler) Options() server.HandlerOptions {
 	return h.opts
 }
--- a/subscriber.go
+++ b/subscriber.go
@@ -1,6 +1,7 @@
 package tcp

 import (
+	"bytes"
 	"context"
 	"fmt"
 	"reflect"
@@ -9,8 +10,9 @@ import (
 	"unicode/utf8"

 	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/options"
+	"go.unistack.org/micro/v3/register"
 	"go.unistack.org/micro/v3/server"
 )

@@ -32,6 +34,7 @@ type tcpSubscriber struct {
 	typ        reflect.Type
 	subscriber interface{}
 	handlers   []*handler
+	endpoints  []*register.Endpoint
 	opts       server.SubscriberOptions
 }

@@ -60,6 +63,7 @@ func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOptio
 		o(&options)
 	}

+	var endpoints []*register.Endpoint
 	var handlers []*handler

 	if typ := reflect.TypeOf(sub); typ.Kind() == reflect.Func {
@@ -76,7 +80,18 @@ func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOptio
 		}

 		handlers = append(handlers, h)
+		ep := &register.Endpoint{
+			Name:     "Func",
+			Request:  register.ExtractSubValue(typ),
+			Metadata: metadata.New(2),
+		}
+		ep.Metadata.Set("topic", topic)
+		ep.Metadata.Set("subscriber", "true")
+		endpoints = append(endpoints, ep)
 	} else {
+		hdlr := reflect.ValueOf(sub)
+		name := reflect.Indirect(hdlr).Type().Name()
+
 		for m := 0; m < typ.NumMethod(); m++ {
 			method := typ.Method(m)
 			h := &handler{
@@ -92,6 +107,14 @@ func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOptio
 			}

 			handlers = append(handlers, h)
+			ep := &register.Endpoint{
+				Name:     name + "." + method.Name,
+				Request:  register.ExtractSubValue(method.Type),
+				Metadata: metadata.New(2),
+			}
+			ep.Metadata.Set("topic", topic)
+			ep.Metadata.Set("subscriber", "true")
+			endpoints = append(endpoints, ep)
 		}
 	}

@@ -101,6 +124,7 @@ func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOptio
 		topic:      topic,
 		subscriber: sub,
 		handlers:   handlers,
+		endpoints:  endpoints,
 		opts:       options,
 	}
 }
@@ -160,11 +184,11 @@ func validateSubscriber(sub server.Subscriber) error {
 	return nil
 }

-func (h *Server) createSubHandler(sb *tcpSubscriber, opts server.Options) broker.Handler {
+func (s *tcpServer) createSubHandler(sb *tcpSubscriber, opts server.Options) broker.Handler {
 	return func(p broker.Event) error {
 		msg := p.Message()
 		ct := msg.Header["Content-Type"]
-		cf, err := h.newCodec(ct)
+		cf, err := s.newCodec(ct)
 		if err != nil {
 			return err
 		}
@@ -196,6 +220,16 @@ func (h *Server) createSubHandler(sb *tcpSubscriber, opts server.Options) broker
 				req = req.Elem()
 			}

+			buf := bytes.NewBuffer(msg.Body)
+
+			if err := cf.ReadHeader(buf, &codec.Message{}, codec.Event); err != nil {
+				return err
+			}
+
+			if err := cf.ReadBody(buf, req.Interface()); err != nil {
+				return err
+			}
+
 			fn := func(ctx context.Context, msg server.Message) error {
 				var vals []reflect.Value
 				if sb.typ.Kind() != reflect.Func {
@@ -214,11 +248,9 @@ func (h *Server) createSubHandler(sb *tcpSubscriber, opts server.Options) broker
 				return nil
 			}

-			opts.Hooks.EachNext(func(hook options.Hook) {
-				if h, ok := hook.(server.HookSubHandler); ok {
-					fn = h(fn)
-				}
-			})
+			for i := len(opts.SubWrappers); i > 0; i-- {
+				fn = opts.SubWrappers[i-1](fn)
+			}

 			go func() {
 				results <- fn(ctx, &tcpMessage{
@@ -255,6 +287,10 @@ func (s *tcpSubscriber) Subscriber() interface{} {
 	return s.subscriber
 }

+func (s *tcpSubscriber) Endpoints() []*register.Endpoint {
+	return s.endpoints
+}
+
 func (s *tcpSubscriber) Options() server.SubscriberOptions {
 	return s.opts
 }
--- a/tcp.go
+++ b/tcp.go
@@ -1,14 +1,12 @@
 // Package tcp implements a go-micro.Server
-package tcp
+package tcp // import "go.unistack.org/micro-server-tcp/v3"

 import (
-	"context"
 	"crypto/tls"
 	"fmt"
 	"net"
 	"sort"
 	"sync"
-	"sync/atomic"
 	"time"

 	"go.unistack.org/micro/v3/broker"
@@ -16,55 +14,34 @@ import (
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/register"
 	"go.unistack.org/micro/v3/server"
-	msync "go.unistack.org/micro/v3/sync"
 	"golang.org/x/net/netutil"
 )

-var _ server.Server = (*Server)(nil)
-
-type Server struct {
+type tcpServer struct {
 	hd          server.Handler
 	rsvc        *register.Service
 	exit        chan chan error
 	subscribers map[*tcpSubscriber][]broker.Subscriber
 	opts        server.Options
 	sync.RWMutex
-	registered  bool
-	init        bool
-	stateLive   *atomic.Uint32
-	stateReady  *atomic.Uint32
-	stateHealth *atomic.Uint32
+	registered bool
+	init       bool
 }

-func (h *Server) Live() bool {
-	return h.stateLive.Load() == 1
-}
-
-func (h *Server) Ready() bool {
-	return h.stateReady.Load() == 1
-}
-
-func (h *Server) Health() bool {
-	return h.stateHealth.Load() == 1
-}
-
-func (h *Server) newCodec(ct string) (codec.Codec, error) {
+func (h *tcpServer) newCodec(ct string) (codec.Codec, error) {
 	if cf, ok := h.opts.Codecs[ct]; ok {
 		return cf, nil
 	}
 	return nil, codec.ErrUnknownContentType
 }

-func (h *Server) Options() server.Options {
+func (h *tcpServer) Options() server.Options {
 	h.RLock()
 	defer h.RUnlock()
 	return h.opts
 }

-func (h *Server) Init(opts ...server.Option) error {
-	if h.opts.Wait == nil {
-		h.opts.Wait = msync.NewWaitGroup()
-	}
+func (h *tcpServer) Init(opts ...server.Option) error {
 	if len(opts) == 0 && h.init {
 		return nil
 	}
@@ -89,21 +66,33 @@ func (h *Server) Init(opts ...server.Option) error {
 	if err := h.opts.Meter.Init(); err != nil {
 		return err
 	}
+	if err := h.opts.Transport.Init(); err != nil {
+		return err
+	}

 	return nil
 }

-func (h *Server) Handle(handler server.Handler) error {
+func (h *tcpServer) Handle(handler server.Handler) error {
 	h.Lock()
 	h.hd = handler
 	h.Unlock()
 	return nil
 }

-func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
+func (h *tcpServer) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
 	options := server.NewHandlerOptions(opts...)

+	eps := make([]*register.Endpoint, 0, len(options.Metadata))
+	for name, metadata := range options.Metadata {
+		eps = append(eps, &register.Endpoint{
+			Name:     name,
+			Metadata: metadata,
+		})
+	}
+
 	th := &tcpHandler{
+		eps:  eps,
 		hd:   handler,
 		opts: options,
 	}
@@ -115,11 +104,11 @@ func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) s
 	return th
 }

-func (h *Server) NewSubscriber(topic string, handler interface{}, opts ...server.SubscriberOption) server.Subscriber {
+func (h *tcpServer) NewSubscriber(topic string, handler interface{}, opts ...server.SubscriberOption) server.Subscriber {
 	return newSubscriber(topic, handler, opts...)
 }

-func (h *Server) Subscribe(sb server.Subscriber) error {
+func (h *tcpServer) Subscribe(sb server.Subscriber) error {
 	sub, ok := sb.(*tcpSubscriber)
 	if !ok {
 		return fmt.Errorf("invalid subscriber: expected *tcpSubscriber")
@@ -142,11 +131,11 @@ func (h *Server) Subscribe(sb server.Subscriber) error {
 	return nil
 }

-func (h *Server) Register() error {
+func (h *tcpServer) Register() error {
 	h.Lock()
 	config := h.opts
 	rsvc := h.rsvc
-
+	eps := h.hd.Endpoints()
 	h.Unlock()

 	// if service already filled, reuse it and return early
@@ -164,6 +153,7 @@ func (h *Server) Register() error {

 	service.Nodes[0].Metadata["protocol"] = "tcp"
 	service.Nodes[0].Metadata["transport"] = service.Nodes[0].Metadata["protocol"]
+	service.Endpoints = eps

 	h.Lock()

@@ -175,7 +165,9 @@ func (h *Server) Register() error {
 	sort.Slice(subscriberList, func(i, j int) bool {
 		return subscriberList[i].topic > subscriberList[j].topic
 	})
-
+	for _, e := range subscriberList {
+		service.Endpoints = append(service.Endpoints, e.Endpoints()...)
+	}
 	h.Unlock()

 	h.RLock()
@@ -184,7 +176,7 @@ func (h *Server) Register() error {

 	if !registered {
 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Info(config.Context, fmt.Sprintf("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)
 		}
 	}

@@ -220,7 +212,7 @@ func (h *Server) Register() error {
 		opts = append(opts, broker.SubscribeAutoAck(sb.Options().AutoAck))

 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Info(config.Context, "Subscribing to topic: "+sb.Topic())
+			config.Logger.Infof(config.Context, "Subscribing to topic: %s", sb.Topic())
 		}

 		sub, err := config.Broker.Subscribe(subCtx, sb.Topic(), handler, opts...)
@@ -236,7 +228,7 @@ func (h *Server) Register() error {
 	return nil
 }

-func (h *Server) Deregister() error {
+func (h *tcpServer) Deregister() error {
 	h.Lock()
 	config := h.opts
 	h.Unlock()
@@ -247,7 +239,7 @@ func (h *Server) Deregister() error {
 	}

 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Info(config.Context, "Deregistering node: "+service.Nodes[0].ID)
+		config.Logger.Infof(config.Context, "Deregistering node: %s", service.Nodes[0].ID)
 	}

 	if err := server.DefaultDeregisterFunc(service, config); err != nil {
@@ -274,11 +266,11 @@ func (h *Server) Deregister() error {
 			go func(s broker.Subscriber) {
 				defer wg.Done()
 				if config.Logger.V(logger.InfoLevel) {
-					config.Logger.Info(config.Context, "Unsubscribing from topic: "+s.Topic())
+					config.Logger.Infof(config.Context, "Unsubscribing from topic: %s", s.Topic())
 				}
 				if err := s.Unsubscribe(subCtx); err != nil {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(config.Context, "Unsubscribing from errot topic: "+s.Topic(), err)
+						config.Logger.Errorf(config.Context, "Unsubscribing from topic: %s err: %v", s.Topic(), err)
 					}
 				}
 			}(sub)
@@ -291,7 +283,7 @@ func (h *Server) Deregister() error {
 	return nil
 }

-func (h *Server) getListener() net.Listener {
+func (h *tcpServer) getListener() net.Listener {
 	if h.opts.Context == nil {
 		return nil
 	}
@@ -304,7 +296,7 @@ func (h *Server) getListener() net.Listener {
 	return l
 }

-func (h *Server) Start() error {
+func (h *tcpServer) Start() error {
 	h.RLock()
 	config := h.opts
 	hd := h.hd.Handler()
@@ -338,7 +330,7 @@ func (h *Server) Start() error {
 	}

 	if config.Logger.V(logger.ErrorLevel) {
-		config.Logger.Info(config.Context, "Listening on "+ts.Addr().String())
+		config.Logger.Infof(config.Context, "Listening on %s", ts.Addr().String())
 	}

 	h.Lock()
@@ -359,9 +351,6 @@ func (h *Server) Start() error {
 		return fmt.Errorf("invalid handler %T", hd)
 	}
 	go h.serve(ts, handle)
-	h.stateLive.Store(1)
-	h.stateReady.Store(1)
-	h.stateHealth.Store(1)

 	go func() {
 		t := new(time.Ticker)
@@ -387,23 +376,23 @@ func (h *Server) Start() error {
 				// nolint: nestif
 				if rerr != nil && registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s deregister, check error", 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.Error(config.Context, fmt.Sprintf("Server %s-%s deregister error", 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.Error(config.Context, fmt.Sprintf("Server %s-%s register check error", 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.Error(config.Context, fmt.Sprintf("Server %s-%s register error", config.Name, config.ID), err)
+						config.Logger.Errorf(config.Context, "Server %s-%s register error: %s", config.Name, config.ID, err)
 					}
 				}
 				// wait for exit
@@ -412,49 +401,36 @@ func (h *Server) Start() error {
 			}
 		}

-		h.gracefulStop()
-
 		ch <- ts.Close()

-		h.stateLive.Store(0)
-		h.stateReady.Store(0)
-		h.stateHealth.Store(0)
-
 		// deregister
 		if cerr := h.Deregister(); cerr != nil {
-			config.Logger.Error(config.Context, "Register deregister error", cerr)
+			config.Logger.Errorf(config.Context, "Register deregister error: %v", cerr)
 		}

 		if cerr := config.Broker.Disconnect(config.Context); cerr != nil {
-			config.Logger.Error(config.Context, "Broker disconnect error", cerr)
+			config.Logger.Errorf(config.Context, "Broker disconnect error: %v", cerr)
 		}
 	}()

 	return nil
 }

-func (h *Server) Stop() error {
+func (h *tcpServer) Stop() error {
 	ch := make(chan error)
 	h.exit <- ch
 	return <-ch
 }

-func (h *Server) gracefulStop() {
-	ctx, cancel := context.WithTimeout(context.Background(), h.opts.GracefulTimeout)
-	defer cancel()
-
-	h.opts.Wait.WaitContext(ctx)
-}
-
-func (h *Server) String() string {
+func (h *tcpServer) String() string {
 	return "tcp"
 }

-func (h *Server) Name() string {
+func (h *tcpServer) Name() string {
 	return h.opts.Name
 }

-func (h *Server) serve(ln net.Listener, hd Handler) {
+func (h *tcpServer) serve(ln net.Listener, hd Handler) {
 	var tempDelay time.Duration // how long to sleep on accept failure
 	h.RLock()
 	config := h.opts
@@ -478,34 +454,27 @@ func (h *Server) serve(ln net.Listener, hd Handler) {
 					tempDelay = max
 				}
 				if config.Logger.V(logger.ErrorLevel) {
-					config.Logger.Error(config.Context, fmt.Sprintf("tcp: Accept error: %v; retrying in %v", err, tempDelay))
+					config.Logger.Errorf(config.Context, "tcp: Accept error: %v; retrying in %v", err, tempDelay)
 				}
 				time.Sleep(tempDelay)
 				continue
 			}
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Error(config.Context, "tcp: Accept error", err)
+				config.Logger.Errorf(config.Context, "tcp: Accept error: %v", err)
 			}
 			return
 		}

-		if h.opts.Wait != nil {
-			h.opts.Wait.Add(1)
+		if err != nil {
+			config.Logger.Errorf(config.Context, "tcp: accept err: %v", err)
+			return
 		}
-		go func() {
-			hd.Serve(c)
-			if h.opts.Wait != nil {
-				h.opts.Wait.Done()
-			}
-		}()
+		go hd.Serve(c)
 	}
 }

 func NewServer(opts ...server.Option) server.Server {
-	return &Server{
-		stateLive:   &atomic.Uint32{},
-		stateReady:  &atomic.Uint32{},
-		stateHealth: &atomic.Uint32{},
+	return &tcpServer{
 		opts:        server.NewOptions(opts...),
 		exit:        make(chan chan error),
 		subscribers: make(map[*tcpSubscriber][]broker.Subscriber),