Merge pull request 'fix query param struct filling' (#168) from matchesfix into master

Reviewed-on: #168

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: For reporting bugs in micro
+about: For reporting bugs in go-micro
 title: "[BUG]"
 labels: ''
 assignees: ''
@@ -16,3 +16,9 @@ assignees: ''
 **How to reproduce the bug:**
 
 If possible, please include a minimal code snippet here.
+
+**Environment:**
+Go Version: please paste `go version` output here
+```
+please paste `go env` output here
+```

.github/ISSUE_TEMPLATE/feature-request---enhancement.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request / Enhancement
-about: If you have a need not served by micro
+about: If you have a need not served by go-micro
 title: "[FEATURE]"
 labels: ''
 assignees: ''
@@ -14,4 +14,4 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
 A clear and concise description of what you want to happen.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question.md

@@ -1,8 +1,14 @@
 ---
 name: Question
-about: Ask a question about micro
+about: Ask a question about go-micro
 title: ''
 labels: ''
 assignees: ''
 
----
+---
+
+Before asking, please check if your question has already been answered: 
+
+1. Check the documentation - https://micro.mu/docs/
+2. Check the examples and plugins - https://github.com/micro/examples & https://github.com/micro/go-plugins
+3. Search existing issues

.github/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 }}

.github/dependabot.yml

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

.github/workflows/autoapprove.yml

@@ -0,0 +1,20 @@
+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 }}

.github/workflows/automerge.yml

@@ -0,0 +1,21 @@
+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}}

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: build
+on:
+ push:
+    branches:
+    - master
+    - v3
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: cache
+      uses: actions/cache@v3
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: lint
+        uses: golangci/golangci-lint-action@v3.4.0
+        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.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "codeql"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+  push:
+    branches: [ master, v3 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, v3 ]
+  schedule:
+    - cron: '34 1 * * 0'
+
+jobs:
+  analyze:
+    name: analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@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

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,27 @@
+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}}

.github/workflows/job_coverage.yml

@@ -1,53 +0,0 @@
-name: coverage
-
-on:
-  push:
-    branches: [ main, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
-  pull_request:
-    branches: [ main, v3, v4 ]
-
-jobs:
-
-  build:
-    if: github.server_url != 'https://github.com'
-    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: test coverage
-      run: |
-        go test -v -cover ./... -covermode=count -coverprofile coverage.out -coverpkg ./...
-        go tool cover -func coverage.out -o coverage.out
-
-    - name: coverage badge
-      uses: tj-actions/coverage-badge-go@v2
-      with:
-        green: 80
-        filename: coverage.out
-
-    - uses: stefanzweifel/git-auto-commit-action@v4
-      name: autocommit
-      with:
-        commit_message: Apply Code Coverage Badge
-        skip_fetch: false
-        skip_checkout: false
-        file_pattern: ./README.md
-
-    - name: push
-      if: steps.auto-commit-action.outputs.changes_detected == 'true'
-      uses: ad-m/github-push-action@master
-      with:
-        github_token: ${{ github.token }}
-        branch: ${{ github.ref }}

.github/workflows/job_lint.yml

@@ -1,29 +0,0 @@
-name: lint
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
-
-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: golangci/golangci-lint-action@v6
-      with:
-        version: 'latest'

.github/workflows/job_sync.yml

@@ -1,94 +0,0 @@
-name: sync
-
-on:
-  schedule:
-    - cron: '*/5 * * * *'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  sync:
-    if: github.server_url != 'https://github.com'
-    runs-on: ubuntu-latest
-    steps:
-    - name: init
-      run: |
-        git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
-        git config --global user.name "github-actions[bot]"
-        echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" >> /root/.netrc
-        echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" >> /root/.netrc
-
-    - name: check master
-      id: check_master
-      run: |
-        src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/master | cut -f1)
-        dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/master | cut -f1)
-        echo "src_hash=$src_hash"
-        echo "dst_hash=$dst_hash"
-        if [ "$src_hash" != "$dst_hash" ]; then
-          echo "sync_needed=true" >> $GITHUB_OUTPUT
-        else
-          echo "sync_needed=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: sync master
-      if: steps.check_master.outputs.sync_needed == 'true'
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream master
-        git push upstream master --progress
-        git push origin master --progress
-        cd ../
-        rm -rf repo
-
-    - name: check v3
-      id: check_v3
-      run: |
-        src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1)
-        dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1)
-        echo "src_hash=$src_hash"
-        echo "dst_hash=$dst_hash"
-        if [ "$src_hash" != "$dst_hash" ]; then
-          echo "sync_needed=true" >> $GITHUB_OUTPUT
-        else
-          echo "sync_needed=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: sync v3
-      if: steps.check_v3.outputs.sync_needed == 'true'
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream v3
-        git push upstream v3 --progress
-        git push origin v3 --progress
-        cd ../
-        rm -rf repo
-
-    - name: check v4
-      id: check_v4
-      run: |
-        src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1)
-        dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1)
-        echo "src_hash=$src_hash"
-        echo "dst_hash=$dst_hash"
-        if [ "$src_hash" != "$dst_hash" ]; then
-          echo "sync_needed=true" >> $GITHUB_OUTPUT
-        else
-          echo "sync_needed=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: sync v4
-      if: steps.check_v4.outputs.sync_needed == 'true'
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream v4
-        git push upstream v4 --progress
-        git push origin v4 --progress
-        cd ../
-        rm -rf repo

.github/workflows/job_test.yml

@@ -1,31 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
-  push:
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
-
-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 ./...

.github/workflows/job_tests.yml

@@ -1,50 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
-  push:
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
-
-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: ${{ github.workspace }}/go.work
-      run: |
-        go work init
-        go work use .
-        go work use micro-tests
-    - name: setup deps
-      env:
-        GOWORK: ${{ github.workspace }}/go.work
-      run: go get -v ./...
-    - name: run tests
-      env:
-        INTEGRATION_TESTS: yes
-        GOWORK: ${{ github.workspace }}/go.work
-      run: |
-        cd micro-tests
-        go test -mod readonly -v ./... || true

.github/workflows/pr.yml

@@ -0,0 +1,47 @@
+name: prbuild
+on:
+  pull_request:
+    branches:
+    - master
+    - v3
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: cache
+      uses: actions/cache@v3
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: lint
+        uses: golangci/golangci-lint-action@v3.4.0
+        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.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.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

.golangci.yml

@@ -1,5 +1,44 @@
 run:
-  concurrency: 8
-  timeout: 5m
+  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

README.md

@@ -1,5 +1,4 @@
 # HTTP Server
-![Coverage](https://img.shields.io/badge/Coverage-5.1%25-red)
 
 The HTTP Server is a go-micro.Server. It's a partial implementation which strips out codecs, transports, etc but enables you 
 to create a HTTP Server that could potentially be used for REST based API services.
@@ -10,8 +9,8 @@ to create a HTTP Server that could potentially be used for REST based API servic
 import (
 	"net/http"
 
-	"github.com/unistack-org/micro/v3/server"
-	httpServer "github.com/unistack-org/micro-server-http"
+	"go.unistack.org/micro/v4/server"
+	httpServer "go.unistack.org/micro-server-http/v4"
 )
 
 func main() {
@@ -38,9 +37,9 @@ Or as part of a service
 import (
 	"net/http"
 
-	"github.com/unistack-org/micro/v3"
-	"github.com/unistack-org/micro/v3/server"
-	httpServer "github.com/unistack-org/micro-server-http"
+	"go.unistack.org/micro/v4"
+	"go.unistack.org/micro/v4/server"
+	httpServer "go.unistack.org/micro-server-http/v4"
 )
 
 func main() {

go.mod

@@ -1,28 +1,16 @@
 module go.unistack.org/micro-server-http/v4
 
-go 1.24.0
+go 1.19
 
 require (
-	github.com/stretchr/testify v1.10.0
-	go.unistack.org/micro-client-http/v4 v4.1.0
-	go.unistack.org/micro-codec-yaml/v4 v4.1.0
-	go.unistack.org/micro-proto/v4 v4.1.0
-	go.unistack.org/micro/v4 v4.1.8
-	golang.org/x/net v0.39.0
+	go.unistack.org/micro-proto/v4 v4.0.0
+	go.unistack.org/micro/v4 v4.0.1
+	golang.org/x/net v0.7.0
 )
 
 require (
-	github.com/ash3in/uuidv8 v1.2.0 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/google/gnostic v0.7.0 // indirect
-	github.com/google/gnostic-models v0.6.9 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/matoous/go-nanoid v1.5.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
-	golang.org/x/sys v0.32.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 // indirect
-	google.golang.org/grpc v1.72.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/gnostic v0.6.9 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

handler.go

@@ -6,19 +6,14 @@ import (
 	"io"
 	"net/http"
 	"reflect"
-	"slices"
-	"strconv"
 	"strings"
-	"time"
+	"sync"
 
 	"go.unistack.org/micro/v4/errors"
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/semconv"
+	"go.unistack.org/micro/v4/register"
 	"go.unistack.org/micro/v4/server"
-	"go.unistack.org/micro/v4/tracer"
 	rhttp "go.unistack.org/micro/v4/util/http"
 	rflutil "go.unistack.org/micro/v4/util/reflect"
 )
@@ -27,7 +22,7 @@ var (
 	DefaultErrorHandler = func(ctx context.Context, s server.Handler, w http.ResponseWriter, r *http.Request, err error, status int) {
 		w.WriteHeader(status)
 		if _, cerr := w.Write([]byte(err.Error())); cerr != nil {
-			logger.DefaultLogger.Error(ctx, "write error", cerr)
+			logger.DefaultLogger.Errorf(ctx, "write failed: %v", cerr)
 		}
 	}
 	DefaultContentType = "application/json"
@@ -44,7 +39,9 @@ type httpHandler struct {
 	hd       interface{}
 	handlers *rhttp.Trie
 	name     string
+	eps      []*register.Endpoint
 	sopts    server.Options
+	sync.RWMutex
 }
 
 func (h *httpHandler) Name() string {
@@ -55,6 +52,10 @@ func (h *httpHandler) Handler() interface{} {
 	return h.hd
 }
 
+func (h *httpHandler) Endpoints() []*register.Endpoint {
+	return h.eps
+}
+
 func (h *httpHandler) Options() server.HandlerOptions {
 	return h.opts
 }
@@ -101,33 +102,24 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 			ct = htype
 		}
 
-		ctx := context.WithValue(r.Context(), rspStatusCodeKey{}, &rspStatusCodeVal{})
-		ctx = context.WithValue(ctx, rspMetadataKey{}, &rspMetadataVal{m: metadata.New(0)})
-
+		ctx := context.WithValue(r.Context(), rspCodeKey{}, &rspCodeVal{})
+		ctx = context.WithValue(ctx, rspHeaderKey{}, &rspHeaderVal{})
 		md, ok := metadata.FromIncomingContext(ctx)
 		if !ok {
 			md = metadata.New(len(r.Header) + 8)
 		}
 		for k, v := range r.Header {
-			md[k] = append(md[k], v...)
+			md[k] = strings.Join(v, ", ")
 		}
-
-		md["RemoteAddr"] = append(md["RemoteAddr"], r.RemoteAddr)
-		md["Method"] = append(md["Method"], r.Method)
-		md["URL"] = append(md["URL"], r.URL.String())
-		md["Proto"] = append(md["Proto"], r.Proto)
-		md["Content-Length"] = append(md["Content-Length"], fmt.Sprintf("%d", r.ContentLength))
-		md["Transfer-Encoding"] = append(md["Transfer-Encoding"], r.TransferEncoding...)
-		md["Host"] = append(md["Host"], r.Host)
-		md["RequestURI"] = append(md["RequestURI"], r.RequestURI)
-		if r.TLS != nil {
-			md["TLS"] = append(md["TLS"], "true")
-			md["TLS-ALPN"] = append(md["TLS-ALPN"], r.TLS.NegotiatedProtocol)
-			md["TLS-ServerName"] = append(md["TLS-ServerName"], r.TLS.ServerName)
-		}
-
+		md["RemoteAddr"] = r.RemoteAddr
+		md["Method"] = r.Method
+		md["URL"] = r.URL.String()
+		md["Proto"] = r.Proto
+		md["ContentLength"] = fmt.Sprintf("%d", r.ContentLength)
+		md["TransferEncoding"] = strings.Join(r.TransferEncoding, ",")
+		md["Host"] = r.Host
+		md["RequestURI"] = r.RequestURI
 		ctx = metadata.NewIncomingContext(ctx, md)
-		ctx = metadata.NewOutgoingContext(ctx, metadata.New(0))
 
 		path := r.URL.Path
 
@@ -159,14 +151,15 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 		}
 
 		if !match && h.registerRPC {
-			for _, microMethod := range md.Get(metadata.HeaderEndpoint) {
+			microMethod, mok := md.Get(metadata.HeaderEndpoint)
+			if mok {
 				serviceMethod := strings.Split(microMethod, ".")
 				if len(serviceMethod) == 2 {
 					if shdlr, ok := h.handlers[serviceMethod[0]]; ok {
 						hdlr := shdlr.(*httpHandler)
 						fh, mp, err := hdlr.handlers.Search(http.MethodPost, "/"+microMethod)
 						if err == nil {
-							// match = true
+							match = true
 							for k, v := range mp {
 								matches[k] = v
 							}
@@ -193,7 +186,8 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 
 		cf, err := h.newCodec(ct)
 		if err != nil {
-			w.WriteHeader(http.StatusUnsupportedMediaType)
+			w.WriteHeader(http.StatusBadRequest)
+			_, _ = w.Write([]byte(err.Error()))
 			return
 		}
 
@@ -257,15 +251,24 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 				err = rerr.(error)
 			}
 
+			md, ok := metadata.FromOutgoingContext(ctx)
+			if !ok {
+				md = metadata.New(0)
+			}
+			if nmd, ok := metadata.FromOutgoingContext(fctx); ok {
+				for k, v := range nmd {
+					md.Set(k, v)
+				}
+			}
+			metadata.SetOutgoingContext(ctx, md)
+
 			return err
 		}
 
 		// wrap the handler func
-		h.opts.Hooks.EachPrev(func(hook options.Hook) {
-			if h, ok := hook.(server.HookHandler); ok {
-				fn = h(fn)
-			}
-		})
+		for i := len(handler.sopts.HdlrWrappers); i > 0; i-- {
+			fn = handler.sopts.HdlrWrappers[i-1](fn)
+		}
 
 		if ct == "application/x-www-form-urlencoded" {
 			cf, err = h.newCodec(DefaultContentType)
@@ -280,12 +283,21 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 		appErr := fn(ctx, hr, replyv.Interface())
 
 		w.Header().Set(metadata.HeaderContentType, ct)
-		for k, v := range getResponseMetadata(ctx) {
-			w.Header()[k] = v
+		if md, ok := metadata.FromOutgoingContext(ctx); ok {
+			for k, v := range md {
+				w.Header().Set(k, v)
+			}
+		}
+		if md := getRspHeader(ctx); md != nil {
+			for k, v := range md {
+				for _, vv := range v {
+					w.Header().Add(k, vv)
+				}
+			}
 		}
 		if nct := w.Header().Get(metadata.HeaderContentType); nct != ct {
 			if cf, err = h.newCodec(nct); err != nil {
-				h.errorHandler(ctx, nil, w, r, err, http.StatusInternalServerError)
+				h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
 				return
 			}
 		}
@@ -306,17 +318,17 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 		}
 
 		if err != nil && handler.sopts.Logger.V(logger.ErrorLevel) {
-			handler.sopts.Logger.Error(handler.sopts.Context, "handler error", err)
+			handler.sopts.Logger.Errorf(handler.sopts.Context, "handler err: %v", err)
 			return
 		}
 
-		if nscode := GetResponseStatusCode(ctx); nscode != 0 {
+		if nscode := GetRspCode(ctx); nscode != 0 {
 			scode = nscode
 		}
 		w.WriteHeader(scode)
 
 		if _, cerr := w.Write(buf); cerr != nil {
-			handler.sopts.Logger.Error(ctx, "write failed", cerr)
+			handler.sopts.Logger.Errorf(ctx, "write failed: %v", cerr)
 		}
 	}, nil
 }
@@ -327,37 +339,31 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		ct = htype
 	}
 
-	ts := time.Now()
-
-	ctx := context.WithValue(r.Context(), rspStatusCodeKey{}, &rspStatusCodeVal{})
-	ctx = context.WithValue(ctx, rspMetadataKey{}, &rspMetadataVal{m: metadata.New(0)})
-
+	ctx := context.WithValue(r.Context(), rspCodeKey{}, &rspCodeVal{})
+	ctx = context.WithValue(ctx, rspHeaderKey{}, &rspHeaderVal{})
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
 		md = metadata.New(len(r.Header) + 8)
 	}
 	for k, v := range r.Header {
-		md[k] = append(md[k], v...)
+		md[k] = strings.Join(v, ", ")
 	}
-
-	md["RemoteAddr"] = append(md["RemoteAddr"], r.RemoteAddr)
+	md["RemoteAddr"] = r.RemoteAddr
 	if r.TLS != nil {
-		md["Scheme"] = append(md["Scheme"], "https")
+		md["Scheme"] = "https"
 	} else {
-		md["Scheme"] = append(md["Scheme"], "http")
+		md["Scheme"] = "http"
 	}
-	md["Method"] = append(md["Method"], r.Method)
-	md["URL"] = append(md["URL"], r.URL.String())
-	md["Proto"] = append(md["Proto"], r.Proto)
-	md["Content-Length"] = append(md["Content-Length"], fmt.Sprintf("%d", r.ContentLength))
+	md["Method"] = r.Method
+	md["URL"] = r.URL.String()
+	md["Proto"] = r.Proto
+	md["ContentLength"] = fmt.Sprintf("%d", r.ContentLength)
 	if len(r.TransferEncoding) > 0 {
-		md["Transfer-Encoding"] = append(md["Transfer-Encoding"], r.TransferEncoding...)
+		md["TransferEncoding"] = strings.Join(r.TransferEncoding, ",")
 	}
-	md["Host"] = append(md["Host"], r.Host)
-	md["RequestURI"] = append(md["RequestURI"], r.RequestURI)
-
+	md["Host"] = r.Host
+	md["RequestURI"] = r.RequestURI
 	ctx = metadata.NewIncomingContext(ctx, md)
-	ctx = metadata.NewOutgoingContext(ctx, metadata.New(0))
 
 	path := r.URL.Path
 	if !strings.HasPrefix(path, "/") {
@@ -389,7 +395,8 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if !match && h.registerRPC {
-		for _, microMethod := range md.Get(metadata.HeaderEndpoint) {
+		microMethod, mok := md.Get(metadata.HeaderEndpoint)
+		if mok {
 			serviceMethod := strings.Split(microMethod, ".")
 			if len(serviceMethod) == 2 {
 				if shdlr, ok := h.handlers[serviceMethod[0]]; ok {
@@ -403,122 +410,26 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 						hldr = fh.(*patHandler)
 						handler = hdlr
 					}
-
 				}
 			}
 		}
 	}
 
-	var sp tracer.Span
 	if !match && h.hd != nil {
 		if hdlr, ok := h.hd.Handler().(http.Handler); ok {
-			endpointName := fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name)
-			if !slices.Contains(tracer.DefaultSkipEndpoints, endpointName) {
-				ctx, sp = h.opts.Tracer.Start(ctx, "rpc-server",
-					tracer.WithSpanKind(tracer.SpanKindServer),
-					tracer.WithSpanLabels(
-						"endpoint", endpointName,
-					),
-				)
-				defer func() {
-					n := GetResponseStatusCode(ctx)
-					if s, _ := sp.Status(); s != tracer.SpanStatusError && n > 399 {
-						sp.SetStatus(tracer.SpanStatusError, http.StatusText(n))
-					}
-					sp.Finish()
-				}()
-			}
-
-			if !slices.Contains(meter.DefaultSkipEndpoints, endpointName) {
-				h.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", endpointName, "server", "http").Inc()
-
-				defer func() {
-					n := GetResponseStatusCode(ctx)
-					if n > 399 {
-						h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", endpointName, "server", "http", "status", "success", "code", strconv.Itoa(n)).Inc()
-					} else {
-						h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", endpointName, "server", "http", "status", "failure", "code", strconv.Itoa(n)).Inc()
-					}
-					te := time.Since(ts)
-					h.opts.Meter.Summary(semconv.ServerRequestLatencyMicroseconds, "endpoint", endpointName, "server", "http").Update(te.Seconds())
-					h.opts.Meter.Histogram(semconv.ServerRequestDurationSeconds, "endpoint", endpointName, "server", "http").Update(te.Seconds())
-					h.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", endpointName, "server", "http").Dec()
-				}()
-			}
-
-			hdlr.ServeHTTP(w, r.WithContext(ctx))
+			hdlr.ServeHTTP(w, r)
 			return
 		}
 	} else if !match {
 		// check for http.HandlerFunc handlers
-		if !slices.Contains(tracer.DefaultSkipEndpoints, r.URL.Path) {
-			ctx, sp = h.opts.Tracer.Start(ctx, "rpc-server",
-				tracer.WithSpanKind(tracer.SpanKindServer),
-				tracer.WithSpanLabels(
-					"endpoint", r.URL.Path,
-					"server", "http",
-				),
-			)
-
-			defer func() {
-				if n := GetResponseStatusCode(ctx); n > 399 {
-					sp.SetStatus(tracer.SpanStatusError, http.StatusText(n))
-				} else {
-					sp.SetStatus(tracer.SpanStatusError, http.StatusText(http.StatusNotFound))
-				}
-				sp.Finish()
-			}()
-		}
 		if ph, _, err := h.pathHandlers.Search(r.Method, r.URL.Path); err == nil {
-			ph.(http.HandlerFunc)(w, r.WithContext(ctx))
+			ph.(http.HandlerFunc)(w, r)
 			return
 		}
 		h.errorHandler(ctx, nil, w, r, fmt.Errorf("not matching route found"), http.StatusNotFound)
 		return
 	}
 
-	endpointName := fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name)
-
-	topts := []tracer.SpanOption{
-		tracer.WithSpanKind(tracer.SpanKindServer),
-		tracer.WithSpanLabels(
-			"endpoint", endpointName,
-			"server", "http",
-		),
-	}
-
-	if slices.Contains(tracer.DefaultSkipEndpoints, endpointName) {
-		topts = append(topts, tracer.WithSpanRecord(false))
-	}
-
-	ctx, sp = h.opts.Tracer.Start(ctx, "rpc-server", topts...)
-
-	if !slices.Contains(meter.DefaultSkipEndpoints, handler.name) {
-		defer func() {
-			te := time.Since(ts)
-			h.opts.Meter.Summary(semconv.ServerRequestLatencyMicroseconds, "endpoint", handler.name, "server", "http").Update(te.Seconds())
-			h.opts.Meter.Histogram(semconv.ServerRequestDurationSeconds, "endpoint", handler.name, "server", "http").Update(te.Seconds())
-			h.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", handler.name, "server", "http").Dec()
-
-			n := GetResponseStatusCode(ctx)
-			if n > 399 {
-				h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", handler.name, "server", "http", "status", "failure", "code", strconv.Itoa(n)).Inc()
-			} else {
-				h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", handler.name, "server", "http", "status", "success", "code", strconv.Itoa(n)).Inc()
-			}
-		}()
-	}
-
-	defer func() {
-		n := GetResponseStatusCode(ctx)
-		if n > 399 {
-			if s, _ := sp.Status(); s != tracer.SpanStatusError {
-				sp.SetStatus(tracer.SpanStatusError, http.StatusText(n))
-			}
-		}
-		sp.Finish()
-	}()
-
 	// get fields from url values
 	if len(r.URL.RawQuery) > 0 {
 		umd, cerr := rflutil.URLMap(r.URL.RawQuery)
@@ -565,7 +476,6 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Body != nil {
 		var buf []byte
 		buf, err = io.ReadAll(r.Body)
-		r.Body.Close()
 		if err != nil && err != io.EOF {
 			h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
 			return
@@ -604,18 +514,24 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			err = rerr.(error)
 		}
 
-		if err != nil && sp != nil {
-			sp.SetStatus(tracer.SpanStatusError, err.Error())
+		md, ok := metadata.FromOutgoingContext(ctx)
+		if !ok {
+			md = metadata.New(0)
 		}
+		if nmd, ok := metadata.FromOutgoingContext(fctx); ok {
+			for k, v := range nmd {
+				md.Set(k, v)
+			}
+		}
+		metadata.SetOutgoingContext(ctx, md)
 
 		return err
 	}
 
-	h.opts.Hooks.EachPrev(func(hook options.Hook) {
-		if h, ok := hook.(server.HookHandler); ok {
-			fn = h(fn)
-		}
-	})
+	// wrap the handler func
+	for i := len(handler.sopts.HdlrWrappers); i > 0; i-- {
+		fn = handler.sopts.HdlrWrappers[i-1](fn)
+	}
 
 	if ct == "application/x-www-form-urlencoded" {
 		cf, err = h.newCodec(DefaultContentType)
@@ -630,12 +546,21 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	appErr := fn(ctx, hr, replyv.Interface())
 
 	w.Header().Set(metadata.HeaderContentType, ct)
-	for k, v := range getResponseMetadata(ctx) {
-		w.Header()[k] = v
+	if md, ok := metadata.FromOutgoingContext(ctx); ok {
+		for k, v := range md {
+			w.Header().Set(k, v)
+		}
+	}
+	if md := getRspHeader(ctx); md != nil {
+		for k, v := range md {
+			for _, vv := range v {
+				w.Header().Add(k, vv)
+			}
+		}
 	}
 	if nct := w.Header().Get(metadata.HeaderContentType); nct != ct {
 		if cf, err = h.newCodec(nct); err != nil {
-			h.errorHandler(ctx, nil, w, r, err, http.StatusInternalServerError)
+			h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
 			return
 		}
 	}
@@ -655,18 +580,17 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		buf, err = cf.Marshal(replyv.Interface())
 	}
 
-	if err != nil {
-		if handler.sopts.Logger.V(logger.ErrorLevel) {
-			handler.sopts.Logger.Error(handler.sopts.Context, "handler error", err)
-		}
-		scode = http.StatusInternalServerError
-	} else if nscode := GetResponseStatusCode(ctx); nscode != 0 {
-		scode = nscode
+	if err != nil && handler.sopts.Logger.V(logger.ErrorLevel) {
+		handler.sopts.Logger.Errorf(handler.sopts.Context, "handler err: %v", err)
+		return
 	}
 
+	if nscode := GetRspCode(ctx); nscode != 0 {
+		scode = nscode
+	}
 	w.WriteHeader(scode)
 
 	if _, cerr := w.Write(buf); cerr != nil {
-		handler.sopts.Logger.Error(ctx, "respoonse write error", cerr)
+		handler.sopts.Logger.Errorf(ctx, "write failed: %v", cerr)
 	}
 }

handler/graphql/graphql.go

@@ -1,77 +0,0 @@
-//go:build ignore
-
-package graphql_handler
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/99designs/gqlgen/graphql"
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/store"
-)
-
-var _ graphql.Cache = (*cacheWrapper)(nil)
-
-type Handler struct {
-	opts Options
-}
-
-type Option func(*Options)
-
-type Options struct {
-	cache *cacheWrapper
-	Path  string
-}
-
-type cacheWrapper struct {
-	s store.Store
-	l logger.Logger
-}
-
-func (c *cacheWrapper) Get(ctx context.Context, key string) (interface{}, bool) {
-	var val interface{}
-	if err := c.s.Read(ctx, key, val); err != nil && err != store.ErrNotFound {
-		c.l.Error(ctx, fmt.Sprintf("cache.Get %s failed", key), err)
-		return nil, false
-	}
-	return val, true
-}
-
-func (c *cacheWrapper) Add(ctx context.Context, key string, val interface{}) {
-	if err := c.s.Write(ctx, key, val); err != nil {
-		c.l.Error(ctx, fmt.Sprintf("cache.Add %s failed", key), err)
-	}
-}
-
-func Store(s store.Store) Option {
-	return func(o *Options) {
-		if o.cache == nil {
-			o.cache = &cacheWrapper{}
-		}
-		o.cache.s = s
-	}
-}
-
-func Logger(l logger.Logger) Option {
-	return func(o *Options) {
-		if o.cache == nil {
-			o.cache = &cacheWrapper{}
-		}
-		o.cache.l = l
-	}
-}
-
-func Path(path string) Option {
-	return func(o *Options) {
-		o.Path = path
-	}
-}
-
-func NewHandler(opts ...Option) *Handler {
-	options := Options{}
-	for _, o := range opts {
-		o(&options)
-	}
-	return &Handler{opts: options}
-}

handler/health/health.go

@@ -1,4 +1,4 @@
-package health_handler
+package health // import "go.unistack.org/micro-server-http/v4/handler/health"
 
 import (
 	"context"
@@ -7,36 +7,21 @@ import (
 	"go.unistack.org/micro/v4/errors"
 )
 
-var _ HealthServiceServer = &Handler{}
+var _ HealthServiceServer = (*Handler)(nil)
 
 type Handler struct {
 	opts Options
 }
 
-type (
-	CheckFunc func(context.Context) error
-	Option    func(*Options)
-)
+type CheckFunc func(context.Context) error
 
-type Stater interface {
-	Live() bool
-	Ready() bool
-	Health() bool
-}
+type Option func(*Options)
 
 type Options struct {
-	Version      string
-	Name         string
-	Staters      []Stater
-	LiveChecks   []CheckFunc
-	ReadyChecks  []CheckFunc
-	HealthChecks []CheckFunc
-}
-
-func Service(s ...Stater) Option {
-	return func(o *Options) {
-		o.Staters = append(o.Staters, s...)
-	}
+	Version     string
+	Name        string
+	LiveChecks  []CheckFunc
+	ReadyChecks []CheckFunc
 }
 
 func LiveChecks(fns ...CheckFunc) Option {
@@ -51,12 +36,6 @@ func ReadyChecks(fns ...CheckFunc) Option {
 	}
 }
 
-func HealthChecks(fns ...CheckFunc) Option {
-	return func(o *Options) {
-		o.HealthChecks = append(o.HealthChecks, fns...)
-	}
-}
-
 func Name(name string) Option {
 	return func(o *Options) {
 		o.Name = name
@@ -77,51 +56,18 @@ func NewHandler(opts ...Option) *Handler {
 	return &Handler{opts: options}
 }
 
-func (h *Handler) Healthy(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error {
-	var err error
-
-	for _, s := range h.opts.Staters {
-		if !s.Health() {
-			return errors.ServiceUnavailable(h.opts.Name, "%v", err)
-		}
-	}
-
-	for _, fn := range h.opts.HealthChecks {
-		if err = fn(ctx); err != nil {
-			return errors.ServiceUnavailable(h.opts.Name, "%v", err)
-		}
-	}
-
-	return nil
-}
-
 func (h *Handler) Live(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error {
 	var err error
-
-	for _, s := range h.opts.Staters {
-		if !s.Live() {
-			return errors.ServiceUnavailable(h.opts.Name, "%v", err)
-		}
-	}
-
 	for _, fn := range h.opts.LiveChecks {
 		if err = fn(ctx); err != nil {
 			return errors.ServiceUnavailable(h.opts.Name, "%v", err)
 		}
 	}
-
 	return nil
 }
 
 func (h *Handler) Ready(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error {
 	var err error
-
-	for _, s := range h.opts.Staters {
-		if !s.Ready() {
-			return errors.ServiceUnavailable(h.opts.Name, "%v", err)
-		}
-	}
-
 	for _, fn := range h.opts.ReadyChecks {
 		if err = fn(ctx); err != nil {
 			return errors.ServiceUnavailable(h.opts.Name, "%v", err)

handler/health/health.proto

@@ -1,29 +1,13 @@
 syntax = "proto3";
 
 package micro.server.http.v4.handler.health;
-option go_package = "go.unistack.org/micro-server-http/v4/handler/health;health_handler";
+option go_package = "go.unistack.org/micro-server-http/v4/handler/health;health";
 
 import "api/annotations.proto";
 import "openapiv3/annotations.proto";
 import "codec/frame.proto";
 
 service HealthService {
-  rpc Healthy(micro.codec.Frame) returns (micro.codec.Frame) {
-		option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "Healthy";
-      responses: {
-        default: {
-          reference: {
-            _ref: "micro.codec.Frame";
-          };
-        };
-      };
-    };
-		option (micro.api.http) = { 
-      get: "/health";
-      additional_bindings: { get: "/healthz"; }
-    };
-  };
 	rpc Live(micro.codec.Frame) returns (micro.codec.Frame) {
 		option (micro.openapiv3.openapiv3_operation) = {
       operation_id: "Live";
@@ -35,10 +19,7 @@ service HealthService {
         };
       };
     };
-		option (micro.api.http) = { 
-      get: "/live";
-      additional_bindings: { get: "/livez"; }
-    };
+		option (micro.api.http) = { get: "/live"; };
   };
 	rpc Ready(micro.codec.Frame) returns (micro.codec.Frame) {
 		option (micro.openapiv3.openapiv3_operation) = {
@@ -51,9 +32,7 @@ service HealthService {
         };
       };
     };
-		option (micro.api.http) = { get: "/ready";
-      additional_bindings: { get: "/readyz"; }
-    };
+		option (micro.api.http) = { get: "/ready"; };
   };
 	rpc Version(micro.codec.Frame) returns (micro.codec.Frame) {
 		option (micro.openapiv3.openapiv3_operation) = {

handler/health/health_micro.pb.go

@@ -1,30 +1,47 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v4.1.0
-// - protoc              v5.29.3
+// - protoc-gen-go-micro v4.0.0
+// - protoc              v3.21.12
 // source: health/health.proto
 
-package health_handler
+package health
 
 import (
 	context "context"
 	codec "go.unistack.org/micro-proto/v4/codec"
-	client "go.unistack.org/micro/v4/client"
+	v4 "go.unistack.org/micro-server-http/v4"
 )
 
 var (
 	HealthServiceName = "HealthService"
 )
-
-type HealthServiceClient interface {
-	Healthy(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error)
-	Live(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error)
-	Ready(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error)
-	Version(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error)
-}
+var (
+	HealthServiceServerEndpoints = []v4.EndpointMetadata{
+		{
+			Name:   "HealthService.Live",
+			Path:   "/live",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "HealthService.Ready",
+			Path:   "/ready",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+		{
+			Name:   "HealthService.Version",
+			Path:   "/version",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+	}
+)
 
 type HealthServiceServer interface {
-	Healthy(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
 	Live(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
 	Ready(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
 	Version(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error

handler/health/health_micro_http.pb.go

@@ -1,162 +1,20 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v4.1.0
+// protoc-gen-go-micro version: v4.0.0
 // source: health/health.proto
 
-package health_handler
+package health
 
 import (
 	context "context"
-	v41 "go.unistack.org/micro-client-http/v4"
 	codec "go.unistack.org/micro-proto/v4/codec"
 	v4 "go.unistack.org/micro-server-http/v4"
-	client "go.unistack.org/micro/v4/client"
 	server "go.unistack.org/micro/v4/server"
-	http "net/http"
 )
 
-var (
-	HealthServiceServerEndpoints = []v4.EndpointMetadata{
-		{
-			Name:   "HealthService.Healthy",
-			Path:   "/health",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "HealthService.Healthy",
-			Path:   "/healthz",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "HealthService.Live",
-			Path:   "/live",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "HealthService.Live",
-			Path:   "/livez",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "HealthService.Ready",
-			Path:   "/ready",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "HealthService.Ready",
-			Path:   "/readyz",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-		{
-			Name:   "HealthService.Version",
-			Path:   "/version",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-	}
-)
-
-type healthServiceClient struct {
-	c    client.Client
-	name string
-}
-
-func NewHealthServiceClient(name string, c client.Client) HealthServiceClient {
-	return &healthServiceClient{c: c, name: name}
-}
-
-func (c *healthServiceClient) Healthy(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error) {
-	errmap := make(map[string]interface{}, 1)
-	errmap["default"] = &codec.Frame{}
-	opts = append(opts,
-		v41.ErrorMap(errmap),
-	)
-	opts = append(opts,
-		v41.Method(http.MethodGet),
-		v41.Path("/health"),
-	)
-	rsp := &codec.Frame{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "HealthService.Healthy", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-func (c *healthServiceClient) Live(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error) {
-	errmap := make(map[string]interface{}, 1)
-	errmap["default"] = &codec.Frame{}
-	opts = append(opts,
-		v41.ErrorMap(errmap),
-	)
-	opts = append(opts,
-		v41.Method(http.MethodGet),
-		v41.Path("/live"),
-	)
-	rsp := &codec.Frame{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "HealthService.Live", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-func (c *healthServiceClient) Ready(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error) {
-	errmap := make(map[string]interface{}, 1)
-	errmap["default"] = &codec.Frame{}
-	opts = append(opts,
-		v41.ErrorMap(errmap),
-	)
-	opts = append(opts,
-		v41.Method(http.MethodGet),
-		v41.Path("/ready"),
-	)
-	rsp := &codec.Frame{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "HealthService.Ready", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-func (c *healthServiceClient) Version(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error) {
-	errmap := make(map[string]interface{}, 1)
-	errmap["default"] = &codec.Frame{}
-	opts = append(opts,
-		v41.ErrorMap(errmap),
-	)
-	opts = append(opts,
-		v41.Method(http.MethodGet),
-		v41.Path("/version"),
-	)
-	rsp := &codec.Frame{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "HealthService.Version", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
 type healthServiceServer struct {
 	HealthServiceServer
 }
 
-func (h *healthServiceServer) Healthy(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
-	return h.HealthServiceServer.Healthy(ctx, req, rsp)
-}
-
 func (h *healthServiceServer) Live(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
 	return h.HealthServiceServer.Live(ctx, req, rsp)
 }
@@ -171,7 +29,6 @@ func (h *healthServiceServer) Version(ctx context.Context, req *codec.Frame, rsp
 
 func RegisterHealthServiceServer(s server.Server, sh HealthServiceServer, opts ...server.HandlerOption) error {
 	type healthService interface {
-		Healthy(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
 		Live(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
 		Ready(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
 		Version(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
@@ -180,6 +37,7 @@ func RegisterHealthServiceServer(s server.Server, sh HealthServiceServer, opts .
 		healthService
 	}
 	h := &healthServiceServer{sh}
-	opts = append(opts, v4.HandlerEndpoints(HealthServiceServerEndpoints))
-	return s.Handle(s.NewHandler(&HealthService{h}, opts...))
+	var nopts []server.HandlerOption
+	nopts = append(nopts, v4.HandlerEndpoints(HealthServiceServerEndpoints))
+	return s.Handle(s.NewHandler(&HealthService{h}, append(nopts, opts...)...))
 }

handler/meter/meter.go

@@ -1,53 +1,27 @@
-package meter_handler
+package meter // import "go.unistack.org/micro-server-http/v4/handler/meter"
 
 import (
 	"bytes"
-	"compress/gzip"
 	"context"
-	"fmt"
-	"io"
-	http "net/http"
-	"strings"
-	"sync"
 
 	codecpb "go.unistack.org/micro-proto/v4/codec"
-	httpsrv "go.unistack.org/micro-server-http/v4"
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/errors"
 	"go.unistack.org/micro/v4/meter"
 )
 
-const (
-	contentEncodingHeader = "Content-Encoding"
-	acceptEncodingHeader  = "Accept-Encoding"
-)
-
-var gzipPool = sync.Pool{
-	New: func() interface{} {
-		return gzip.NewWriter(nil)
-	},
-}
-
-var bufPool = sync.Pool{
-	New: func() interface{} {
-		return bytes.NewBuffer(nil)
-	},
-}
-
 // guard to fail early
-var _ MeterServiceServer = &Handler{}
+var _ MeterServiceServer = (*Handler)(nil)
 
 type Handler struct {
-	Options Options
+	opts Options
 }
 
 type Option func(*Options)
 
 type Options struct {
-	Meter           meter.Meter
-	Name            string
-	MeterOptions    []meter.Option
-	DisableCompress bool
+	Meter        meter.Meter
+	Name         string
+	MeterOptions []meter.Option
 }
 
 func Meter(m meter.Meter) Option {
@@ -62,12 +36,6 @@ func Name(name string) Option {
 	}
 }
 
-func DisableCompress(g bool) Option {
-	return func(o *Options) {
-		o.DisableCompress = g
-	}
-}
-
 func MeterOptions(opts ...meter.Option) Option {
 	return func(o *Options) {
 		o.MeterOptions = append(o.MeterOptions, opts...)
@@ -75,7 +43,7 @@ func MeterOptions(opts ...meter.Option) Option {
 }
 
 func NewOptions(opts ...Option) Options {
-	options := Options{Meter: meter.DefaultMeter, DisableCompress: false}
+	options := Options{Meter: meter.DefaultMeter}
 	for _, o := range opts {
 		o(&options)
 	}
@@ -84,98 +52,16 @@ func NewOptions(opts ...Option) Options {
 
 func NewHandler(opts ...Option) *Handler {
 	options := NewOptions(opts...)
-	return &Handler{Options: options}
-}
-
-func (h *Handler) HTTPHandlerFunc(w http.ResponseWriter, r *http.Request) {
-	var wr io.Writer
-	if v := r.Header.Get(acceptEncodingHeader); strings.Contains(v, "gzip") && !h.Options.DisableCompress {
-		w.Header().Add(contentEncodingHeader, "gzip")
-
-		gz := gzipPool.Get().(*gzip.Writer)
-		defer gzipPool.Put(gz)
-
-		gz.Reset(w)
-		defer gz.Close()
-
-		wr = gz
-	} else {
-		wr = w
-	}
-
-	if err := h.Options.Meter.Write(wr, h.Options.MeterOptions...); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	// gz.Flush() must be called after writing metrics to ensure buffered data is written to the underlying writer.
-	if gz, ok := wr.(*gzip.Writer); ok {
-		gz.Flush()
-	}
+	return &Handler{opts: options}
 }
 
 func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error {
-	log, ok := logger.FromContext(ctx)
-	if !ok {
-		log = logger.DefaultLogger
-	}
-
-	var err error
-
-	if md, ok := metadata.FromIncomingContext(ctx); ok && gzipAccepted(md) && !h.Options.DisableCompress {
-		err = h.writeMetricsGzip(ctx, rsp)
-	} else {
-		err = h.writeMetricsPlain(ctx, rsp)
-	}
-
-	if err != nil {
-		log.Error(ctx, "http/meter write failed", err)
-	}
-
-	return nil
-}
-
-func (h *Handler) writeMetricsGzip(ctx context.Context, rsp *codecpb.Frame) error {
-	httpsrv.AppendResponseMetadata(ctx, metadata.Pairs(contentEncodingHeader, "gzip"))
-
-	buf := bufPool.Get().(*bytes.Buffer)
-	defer bufPool.Put(buf)
-	buf.Reset()
-
-	gz := gzipPool.Get().(*gzip.Writer)
-	defer gzipPool.Put(gz)
-	gz.Reset(buf)
-
-	if err := h.Options.Meter.Write(gz, h.Options.MeterOptions...); err != nil {
-		return fmt.Errorf("meter write: %w", err)
-	}
-
-	if err := gz.Close(); err != nil {
-		return fmt.Errorf("gzip close: %w", err)
+	buf := bytes.NewBuffer(nil)
+	if err := h.opts.Meter.Write(buf, h.opts.MeterOptions...); err != nil {
+		return errors.InternalServerError(h.opts.Name, "%v", err)
 	}
 
 	rsp.Data = buf.Bytes()
 
 	return nil
 }
-
-func (h *Handler) writeMetricsPlain(_ context.Context, rsp *codecpb.Frame) error {
-	buf := bufPool.Get().(*bytes.Buffer)
-	defer bufPool.Put(buf)
-	buf.Reset()
-
-	if err := h.Options.Meter.Write(buf, h.Options.MeterOptions...); err != nil {
-		return fmt.Errorf("meter write: %w", err)
-	}
-
-	rsp.Data = buf.Bytes()
-
-	return nil
-}
-
-// gzipAccepted returns whether the client will accept gzip-encoded content.
-func gzipAccepted(md metadata.Metadata) bool {
-	a := md.GetJoined(acceptEncodingHeader)
-
-	return strings.Contains(a, "gzip")
-}

handler/meter/meter.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
-package micro.server.http.v3.handler.meter;
-option go_package = "go.unistack.org/micro-server-http/v4/handler/meter;meter_handler";
+package micro.server.http.v4.handler.meter;
+option go_package = "go.unistack.org/micro-server-http/v4/handler/meter;meter";
 
 import "api/annotations.proto";
 import "openapiv3/annotations.proto";

handler/meter/meter_micro.pb.go

@@ -1,24 +1,31 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v4.1.0
-// - protoc              v5.29.3
+// - protoc-gen-go-micro v4.0.0
+// - protoc              v3.21.12
 // source: meter/meter.proto
 
-package meter_handler
+package meter
 
 import (
 	context "context"
 	codec "go.unistack.org/micro-proto/v4/codec"
-	client "go.unistack.org/micro/v4/client"
+	v4 "go.unistack.org/micro-server-http/v4"
 )
 
 var (
 	MeterServiceName = "MeterService"
 )
-
-type MeterServiceClient interface {
-	Metrics(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error)
-}
+var (
+	MeterServiceServerEndpoints = []v4.EndpointMetadata{
+		{
+			Name:   "MeterService.Metrics",
+			Path:   "/metrics",
+			Method: "GET",
+			Body:   "",
+			Stream: false,
+		},
+	}
+)
 
 type MeterServiceServer interface {
 	Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error

handler/meter/meter_micro_http.pb.go

@@ -1,58 +1,16 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v4.1.0
+// protoc-gen-go-micro version: v4.0.0
 // source: meter/meter.proto
 
-package meter_handler
+package meter
 
 import (
 	context "context"
-	v41 "go.unistack.org/micro-client-http/v4"
 	codec "go.unistack.org/micro-proto/v4/codec"
 	v4 "go.unistack.org/micro-server-http/v4"
-	client "go.unistack.org/micro/v4/client"
 	server "go.unistack.org/micro/v4/server"
-	http "net/http"
 )
 
-var (
-	MeterServiceServerEndpoints = []v4.EndpointMetadata{
-		{
-			Name:   "MeterService.Metrics",
-			Path:   "/metrics",
-			Method: "GET",
-			Body:   "",
-			Stream: false,
-		},
-	}
-)
-
-type meterServiceClient struct {
-	c    client.Client
-	name string
-}
-
-func NewMeterServiceClient(name string, c client.Client) MeterServiceClient {
-	return &meterServiceClient{c: c, name: name}
-}
-
-func (c *meterServiceClient) Metrics(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error) {
-	errmap := make(map[string]interface{}, 1)
-	errmap["default"] = &codec.Frame{}
-	opts = append(opts,
-		v41.ErrorMap(errmap),
-	)
-	opts = append(opts,
-		v41.Method(http.MethodGet),
-		v41.Path("/metrics"),
-	)
-	rsp := &codec.Frame{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "MeterService.Metrics", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
 type meterServiceServer struct {
 	MeterServiceServer
 }
@@ -69,6 +27,7 @@ func RegisterMeterServiceServer(s server.Server, sh MeterServiceServer, opts ...
 		meterService
 	}
 	h := &meterServiceServer{sh}
-	opts = append(opts, v4.HandlerEndpoints(MeterServiceServerEndpoints))
-	return s.Handle(s.NewHandler(&MeterService{h}, opts...))
+	var nopts []server.HandlerOption
+	nopts = append(nopts, v4.HandlerEndpoints(MeterServiceServerEndpoints))
+	return s.Handle(s.NewHandler(&MeterService{h}, append(nopts, opts...)...))
 }

handler/pprof/pprof.go

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

handler/spa/spa.go

@@ -1,19 +0,0 @@
-package spa
-
-import (
-	"io/fs"
-	"net/http"
-	"strings"
-)
-
-// Handler serve files from dir and redirect to index if file not exists
-var Handler = func(prefix string, dir fs.FS) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		f := http.StripPrefix(prefix, http.FileServer(http.FS(dir)))
-		if _, err := fs.Stat(dir, strings.TrimPrefix(r.RequestURI, prefix)); err != nil {
-			r.RequestURI = prefix
-			r.URL.Path = prefix
-		}
-		f.ServeHTTP(w, r)
-	}
-}

handler/swagger-ui/swagger-initializer.js

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

handler/swagger-ui/swaggerui.go

@@ -1,4 +1,4 @@
-package swaggerui_handler
+package swaggerui // import "go.unistack.org/micro-server-http/v4/handler/swagger-ui"
 
 import (
 	"embed"

handler/swagger-ui/swaggerui_test.go

@@ -1,4 +1,4 @@
-package swaggerui_handler
+package swaggerui
 
 import (
 	"net/http"

handler/swagger/swagger.go

@@ -1,61 +0,0 @@
-package swagger_handler
-
-import (
-	"io/fs"
-	"net/http"
-
-	yamlcodec "go.unistack.org/micro-codec-yaml/v4"
-	rutil "go.unistack.org/micro/v4/util/reflect"
-)
-
-// Handler append to generated swagger data from dst map[string]interface{}
-var Handler = func(dst map[string]interface{}, fsys fs.FS) http.HandlerFunc {
-	c := yamlcodec.NewCodec()
-	return func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != http.MethodGet {
-			w.WriteHeader(http.StatusNotFound)
-			return
-		}
-
-		path := r.URL.Path
-		if len(path) > 1 && path[0] == '/' {
-			path = path[1:]
-		}
-
-		buf, err := fs.ReadFile(fsys, path)
-		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			_, _ = w.Write([]byte(err.Error()))
-			return
-		}
-
-		if dst == nil {
-			w.WriteHeader(http.StatusOK)
-			_, _ = w.Write(buf)
-			return
-		}
-
-		var src interface{}
-
-		if err = c.Unmarshal(buf, src); err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			_, _ = w.Write([]byte(err.Error()))
-			return
-		}
-
-		if err = rutil.Merge(src, dst); err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			_, _ = w.Write([]byte(err.Error()))
-			return
-		}
-
-		if buf, err = c.Marshal(src); err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			_, _ = w.Write([]byte(err.Error()))
-			return
-		}
-
-		w.WriteHeader(http.StatusOK)
-		_, _ = w.Write(buf)
-	}
-}

http.go

@@ -1,5 +1,5 @@
 // Package http implements a go-micro.Server
-package http // import "go.unistack.org/micro-server-http/v3"
+package http // import "go.unistack.org/micro-server-http/v4"
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	"reflect"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"go.unistack.org/micro/v4/codec"
@@ -32,22 +31,19 @@ type Server struct {
 	errorHandler func(context.Context, server.Handler, http.ResponseWriter, *http.Request, error, int)
 	pathHandlers *rhttp.Trie
 	opts         server.Options
-	stateLive    *atomic.Uint32
-	stateReady   *atomic.Uint32
-	stateHealth  *atomic.Uint32
 	registerRPC  bool
-	mu           sync.RWMutex
-	registered   bool
-	init         bool
+	sync.RWMutex
+	registered bool
+	init       bool
 }
 
 func (h *Server) newCodec(ct string) (codec.Codec, error) {
 	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
 		ct = ct[:idx]
 	}
-	h.mu.RLock()
+	h.RLock()
 	cf, ok := h.opts.Codecs[ct]
-	h.mu.RUnlock()
+	h.RUnlock()
 	if ok {
 		return cf, nil
 	}
@@ -55,9 +51,9 @@ func (h *Server) newCodec(ct string) (codec.Codec, error) {
 }
 
 func (h *Server) Options() server.Options {
-	h.mu.Lock()
+	h.Lock()
 	opts := h.opts
-	h.mu.Unlock()
+	h.Unlock()
 	return opts
 }
 
@@ -66,7 +62,7 @@ func (h *Server) Init(opts ...server.Option) error {
 		return nil
 	}
 
-	h.mu.Lock()
+	h.Lock()
 
 	for _, o := range opts {
 		o(&h.opts)
@@ -89,41 +85,40 @@ func (h *Server) Init(opts ...server.Option) error {
 		for pm, ps := range phs.h {
 			for pp, ph := range ps {
 				if err := h.pathHandlers.Insert([]string{pm}, pp, ph); err != nil {
-					h.mu.Unlock()
+					h.Unlock()
 					return err
 				}
 			}
 		}
 	}
-	h.mu.Unlock()
+	h.Unlock()
 
-	h.mu.RLock()
+	h.RLock()
 	if err := h.opts.Register.Init(); err != nil {
-		h.mu.RUnlock()
-		return err
-	}
-	if err := h.opts.Broker.Init(); err != nil {
-		h.mu.RUnlock()
+		h.RUnlock()
 		return err
 	}
 	if err := h.opts.Tracer.Init(); err != nil {
-		h.mu.RUnlock()
+		h.RUnlock()
 		return err
 	}
 	if err := h.opts.Logger.Init(); err != nil {
-		h.mu.RUnlock()
+		h.RUnlock()
 		return err
 	}
 	if err := h.opts.Meter.Init(); err != nil {
-		h.mu.RUnlock()
+		h.RUnlock()
 		return err
 	}
+	if err := h.opts.Transport.Init(); err != nil {
+		h.RUnlock()
+		return err
+	}
+	h.RUnlock()
 
-	h.mu.RUnlock()
-
-	h.mu.Lock()
+	h.Lock()
 	h.init = true
-	h.mu.Unlock()
+	h.Unlock()
 
 	return nil
 }
@@ -132,27 +127,27 @@ func (h *Server) Handle(handler server.Handler) error {
 	// passed unknown handler
 	hdlr, ok := handler.(*httpHandler)
 	if !ok {
-		h.mu.Lock()
+		h.Lock()
 		h.hd = handler
-		h.mu.Unlock()
+		h.Unlock()
 		return nil
 	}
 
 	// passed http.Handler like some muxer
 	if _, ok := hdlr.hd.(http.Handler); ok {
-		h.mu.Lock()
+		h.Lock()
 		h.hd = handler
-		h.mu.Unlock()
+		h.Unlock()
 		return nil
 	}
 
 	// passed micro compat handler
-	h.mu.Lock()
+	h.Lock()
 	if h.handlers == nil {
 		h.handlers = make(map[string]server.Handler)
 	}
 	h.handlers[handler.Name()] = handler
-	h.mu.Unlock()
+	h.Unlock()
 
 	return nil
 }
@@ -160,7 +155,16 @@ func (h *Server) Handle(handler server.Handler) error {
 func (h *Server) 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,
+		})
+	}
+
 	hdlr := &httpHandler{
+		eps:      eps,
 		hd:       handler,
 		opts:     options,
 		sopts:    h.opts,
@@ -169,10 +173,16 @@ func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) s
 
 	tp := reflect.TypeOf(handler)
 
-	registerCORS := false
-	if v, ok := options.Context.Value(registerCORSHandlerKey{}).(bool); ok && v {
-		registerCORS = true
-	}
+	/*
+		if len(options.Metadata) == 0 {
+			if h.registerRPC {
+				h.opts.Logger.Infof(h.opts.Context, "register rpc handler for http.MethodPost %s /%s", hn, hn)
+				if err := hdlr.handlers.Insert([]string{http.MethodPost}, "/"+hn, pth); err != nil {
+					h.opts.Logger.Errorf(h.opts.Context, "cant add rpc handler for http.MethodPost %s /%s", hn, hn)
+				}
+			}
+		}
+	*/
 
 	for hn, md := range options.Metadata {
 		var method reflect.Method
@@ -187,16 +197,16 @@ func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) s
 		}
 
 		if method.Name == "" && h.opts.Logger.V(logger.ErrorLevel) {
-			h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("nil method for %s", mname))
+			h.opts.Logger.Errorf(h.opts.Context, "nil method for %s", mname)
 			continue
 		}
 
 		mtype, err := prepareEndpoint(method)
 		if err != nil && h.opts.Logger.V(logger.ErrorLevel) {
-			h.opts.Logger.Error(h.opts.Context, "endpoint error", err)
+			h.opts.Logger.Errorf(h.opts.Context, "%v", err)
 			continue
 		} else if mtype == nil {
-			h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("nil mtype for %s", mname))
+			h.opts.Logger.Errorf(h.opts.Context, "nil mtype for %s", mname)
 			continue
 		}
 
@@ -206,26 +216,14 @@ func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) s
 		pth := &patHandler{mtype: mtype, name: name, rcvr: rcvr}
 		hdlr.name = name
 
-		methods := md["Method"]
-		if registerCORS {
-			methods = append(methods, http.MethodOptions)
-		}
-
-		pattern := md["Path"]
-		for i := len(pattern) - 1; i >= 0; i-- {
-			if err := hdlr.handlers.Insert(methods, pattern[i], pth); err != nil {
-				h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("cant add handler for %v %s: index %d", methods, md["Path"], i))
-			}
+		if err := hdlr.handlers.Insert([]string{md["Method"]}, md["Path"], pth); err != nil {
+			h.opts.Logger.Errorf(h.opts.Context, "cant add handler for %s %s", md["Method"], md["Path"])
 		}
 
 		if h.registerRPC {
-			methods := []string{http.MethodPost}
-			if registerCORS {
-				methods = append(methods, http.MethodOptions)
-			}
-
-			if err := hdlr.handlers.Insert(methods, "/"+hn, pth); err != nil {
-				h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("cant add rpc handler for http.MethodPost %s /%s", hn, hn))
+			h.opts.Logger.Infof(h.opts.Context, "register rpc handler for http.MethodPost %s /%s", hn, hn)
+			if err := hdlr.handlers.Insert([]string{http.MethodPost}, "/"+hn, pth); err != nil {
+				h.opts.Logger.Errorf(h.opts.Context, "cant add rpc handler for http.MethodPost %s /%s", hn, hn)
 			}
 		}
 	}
@@ -249,16 +247,16 @@ func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) s
 		}
 
 		if method.Name == "" && h.opts.Logger.V(logger.ErrorLevel) {
-			h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("nil method for %s", mname))
+			h.opts.Logger.Errorf(h.opts.Context, "nil method for %s", mname)
 			continue
 		}
 
 		mtype, err := prepareEndpoint(method)
 		if err != nil && h.opts.Logger.V(logger.ErrorLevel) {
-			h.opts.Logger.Error(h.opts.Context, "prepare endpoint error", err)
+			h.opts.Logger.Errorf(h.opts.Context, "%v", err)
 			continue
 		} else if mtype == nil {
-			h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("nil mtype for %s", mname))
+			h.opts.Logger.Errorf(h.opts.Context, "nil mtype for %s", mname)
 			continue
 		}
 
@@ -268,24 +266,14 @@ func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) s
 		pth := &patHandler{mtype: mtype, name: name, rcvr: rcvr}
 		hdlr.name = name
 
-		methods := []string{md.Method}
-		if registerCORS {
-			methods = append(methods, http.MethodOptions)
-		}
-
-		if err := hdlr.handlers.Insert(methods, md.Path, pth); err != nil {
-			h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("cant add handler for %s %s", md.Method, md.Path))
+		if err := hdlr.handlers.Insert([]string{md.Method}, md.Path, pth); err != nil {
+			h.opts.Logger.Errorf(h.opts.Context, "cant add handler for %s %s", md.Method, md.Path)
 		}
 
 		if h.registerRPC {
-			methods := []string{http.MethodPost}
-			if registerCORS {
-				methods = append(methods, http.MethodOptions)
-			}
-
-			h.opts.Logger.Info(h.opts.Context, fmt.Sprintf("register rpc handler for http.MethodPost %s /%s", hn, hn))
-			if err := hdlr.handlers.Insert(methods, "/"+hn, pth); err != nil {
-				h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("cant add rpc handler for http.MethodPost %s /%s", hn, hn))
+			h.opts.Logger.Infof(h.opts.Context, "register rpc handler for http.MethodPost %s /%s", hn, hn)
+			if err := hdlr.handlers.Insert([]string{http.MethodPost}, "/"+hn, pth); err != nil {
+				h.opts.Logger.Errorf(h.opts.Context, "cant add rpc handler for http.MethodPost %s /%s", hn, hn)
 			}
 		}
 	}
@@ -294,10 +282,14 @@ func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) s
 }
 
 func (h *Server) Register() error {
-	h.mu.RLock()
+	var eps []*register.Endpoint
+	h.RLock()
+	for _, hdlr := range h.handlers {
+		eps = append(eps, hdlr.Endpoints()...)
+	}
 	rsvc := h.rsvc
 	config := h.opts
-	h.mu.RUnlock()
+	h.RUnlock()
 
 	// if service already filled, reuse it and return early
 	if rsvc != nil {
@@ -311,14 +303,16 @@ func (h *Server) Register() error {
 	if err != nil {
 		return err
 	}
+	service.Nodes[0].Metadata["protocol"] = "http"
+	service.Endpoints = eps
 
-	h.mu.RLock()
+	h.RLock()
 	registered := h.registered
-	h.mu.RUnlock()
+	h.RUnlock()
 
 	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)
 		}
 	}
 
@@ -332,19 +326,18 @@ func (h *Server) Register() error {
 		return nil
 	}
 
-	h.mu.Lock()
-
+	h.Lock()
 	h.registered = true
 	h.rsvc = service
-	h.mu.Unlock()
+	h.Unlock()
 
 	return nil
 }
 
 func (h *Server) Deregister() error {
-	h.mu.RLock()
+	h.RLock()
 	config := h.opts
-	h.mu.RUnlock()
+	h.RUnlock()
 
 	service, err := server.NewRegisterService(h)
 	if err != nil {
@@ -352,31 +345,30 @@ 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 {
 		return err
 	}
 
-	h.mu.Lock()
+	h.Lock()
 	h.rsvc = nil
 
 	if !h.registered {
-		h.mu.Unlock()
+		h.Unlock()
 		return nil
 	}
 
 	h.registered = false
-
-	h.mu.Unlock()
+	h.Unlock()
 	return nil
 }
 
 func (h *Server) Start() error {
-	h.mu.RLock()
+	h.RLock()
 	config := h.opts
-	h.mu.RUnlock()
+	h.RUnlock()
 
 	// micro: config.Transport.Listen(config.Address)
 	var ts net.Listener
@@ -403,14 +395,15 @@ func (h *Server) Start() error {
 	}
 
 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Info(config.Context, "Listening on "+ts.Addr().String())
+		config.Logger.Infof(config.Context, "Listening on %s", ts.Addr().String())
 	}
 
-	h.mu.Lock()
+	h.Lock()
 	h.opts.Address = ts.Addr().String()
-	h.mu.Unlock()
+	h.Unlock()
 
 	var handler http.Handler
+	var srvFunc func(net.Listener) error
 
 	// nolint: nestif
 	if h.opts.Context != nil {
@@ -441,13 +434,9 @@ func (h *Server) Start() error {
 		return fmt.Errorf("cant process with nil handler")
 	}
 
-	if err := config.Broker.Connect(h.opts.Context); err != nil {
-		return err
-	}
-
 	if err := config.RegisterCheck(h.opts.Context); err != nil {
 		if config.Logger.V(logger.ErrorLevel) {
-			config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s register check error", config.Name, config.ID), err)
+			config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, err)
 		}
 	} else {
 		if err = h.Register(); err != nil {
@@ -457,7 +446,6 @@ func (h *Server) Start() error {
 
 	fn := handler
 
-	var hs *http.Server
 	if h.opts.Context != nil {
 		if mwf, ok := h.opts.Context.Value(middlewareKey{}).([]func(http.Handler) http.Handler); ok && len(mwf) > 0 {
 			// wrap the handler func
@@ -465,22 +453,25 @@ func (h *Server) Start() error {
 				fn = mwf[i-1](fn)
 			}
 		}
-		var ok bool
-		if hs, ok = h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil {
+		if hs, ok := h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil {
 			hs.Handler = fn
-		} else {
-			hs = &http.Server{Handler: fn}
+			srvFunc = hs.Serve
 		}
 	}
 
-	go func() {
-		if cerr := hs.Serve(ts); cerr != nil && !errors.Is(cerr, http.ErrServerClosed) {
-			h.opts.Logger.Error(h.opts.Context, "serve error", cerr)
-		}
-		h.stateLive.Store(0)
-		h.stateReady.Store(0)
-		h.stateHealth.Store(0)
-	}()
+	if srvFunc != nil {
+		go func() {
+			if cerr := srvFunc(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
+				h.opts.Logger.Error(h.opts.Context, cerr)
+			}
+		}()
+	} else {
+		go func() {
+			if cerr := http.Serve(ts, fn); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
+				h.opts.Logger.Error(h.opts.Context, cerr)
+			}
+		}()
+	}
 
 	go func() {
 		t := new(time.Ticker)
@@ -499,35 +490,35 @@ func (h *Server) Start() error {
 			select {
 			// register self on interval
 			case <-t.C:
-				h.mu.RLock()
+				h.RLock()
 				registered := h.registered
-				h.mu.RUnlock()
+				h.RUnlock()
 				rerr := config.RegisterCheck(h.opts.Context)
 				// nolint: nestif
 				if rerr != nil && registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s register check error, deregister it", config.Name, config.ID), rerr)
+						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s, deregister it", config.Name, config.ID, rerr)
 					}
 					// deregister self in case of error
 					if err := h.Deregister(); err != nil {
 						if config.Logger.V(logger.ErrorLevel) {
-							config.Logger.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)
 					}
 				}
 
 				if err := h.Register(); err != nil {
-					config.Logger.Error(config.Context, "Server register error", err)
+					config.Logger.Errorf(config.Context, "Server register error: %s", err)
 				}
 			// wait for exit
 			case ch = <-h.exit:
@@ -537,28 +528,12 @@ func (h *Server) Start() error {
 
 		// deregister
 		if err := h.Deregister(); err != nil {
-			config.Logger.Error(config.Context, "Server deregister error", err)
+			config.Logger.Errorf(config.Context, "Server deregister error: %s", err)
 		}
 
-		if err := config.Broker.Disconnect(config.Context); err != nil {
-			config.Logger.Error(config.Context, "Broker disconnect error", err)
-		}
-
-		ctx, cancel := context.WithTimeout(context.Background(), h.opts.GracefulTimeout)
-		defer cancel()
-
-		err := hs.Shutdown(ctx)
-		if err != nil {
-			err = hs.Close()
-		}
-
-		ch <- err
+		ch <- ts.Close()
 	}()
 
-	h.stateLive.Store(1)
-	h.stateReady.Store(1)
-	h.stateHealth.Store(1)
-
 	return nil
 }
 
@@ -576,18 +551,6 @@ func (h *Server) Name() string {
 	return h.opts.Name
 }
 
-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 NewServer(opts ...server.Option) *Server {
 	options := server.NewOptions(opts...)
 	eh := DefaultErrorHandler
@@ -595,9 +558,6 @@ func NewServer(opts ...server.Option) *Server {
 		eh = v
 	}
 	return &Server{
-		stateLive:    &atomic.Uint32{},
-		stateReady:   &atomic.Uint32{},
-		stateHealth:  &atomic.Uint32{},
 		opts:         options,
 		exit:         make(chan chan error),
 		errorHandler: eh,

message.go

@@ -0,0 +1,35 @@
+package http
+
+import (
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/metadata"
+)
+
+type httpMessage struct {
+	payload     interface{}
+	codec       codec.Codec
+	header      metadata.Metadata
+	topic       string
+	contentType string
+	body        []byte
+}
+
+func (r *httpMessage) Topic() string {
+	return r.topic
+}
+
+func (r *httpMessage) ContentType() string {
+	return r.contentType
+}
+
+func (r *httpMessage) Header() metadata.Metadata {
+	return r.header
+}
+
+func (r *httpMessage) Body() interface{} {
+	return r.payload
+}
+
+func (r *httpMessage) Codec() codec.Codec {
+	return r.codec
+}

metadata.go

@@ -1,47 +0,0 @@
-package http
-
-import (
-	"context"
-
-	"go.unistack.org/micro/v4/metadata"
-)
-
-type (
-	rspMetadataKey struct{}
-	rspMetadataVal struct {
-		m metadata.Metadata
-	}
-)
-
-// AppendResponseMetadata adds metadata entries to metadata.Metadata stored in the context.
-// It expects the context to contain a *rspMetadataVal value under the rspMetadataKey{} key.
-// If the value is missing or invalid, the function does nothing.
-//
-// Note: this function is not thread-safe. Synchronization is required if used from multiple goroutines.
-func AppendResponseMetadata(ctx context.Context, md metadata.Metadata) {
-	if md == nil {
-		return
-	}
-
-	val, ok := ctx.Value(rspMetadataKey{}).(*rspMetadataVal)
-	if !ok || val == nil || val.m == nil {
-		return
-	}
-
-	for key, values := range md {
-		val.m.Append(key, values...)
-	}
-}
-
-// getResponseMetadata retrieves the metadata.Metadata stored in the context.
-//
-// Note: this function is not thread-safe. Synchronization is required if used from multiple goroutines.
-// If you plan to modify the returned metadata, make a full copy to avoid affecting shared state.
-func getResponseMetadata(ctx context.Context) metadata.Metadata {
-	val, ok := ctx.Value(rspMetadataKey{}).(*rspMetadataVal)
-	if !ok || val == nil || val.m == nil {
-		return nil
-	}
-
-	return val.m
-}

metadata_test.go

@@ -1,136 +0,0 @@
-package http
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"go.unistack.org/micro/v4/metadata"
-)
-
-func TestAppendResponseMetadata(t *testing.T) {
-	tests := []struct {
-		name     string
-		ctx      context.Context
-		md       metadata.Metadata
-		expected context.Context
-	}{
-		{
-			name:     "nil metadata",
-			ctx:      context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: metadata.Metadata{}}),
-			md:       nil,
-			expected: context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: metadata.Metadata{}}),
-		},
-		{
-			name:     "empty metadata",
-			ctx:      context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: metadata.Metadata{}}),
-			md:       metadata.Metadata{},
-			expected: context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: metadata.Metadata{}}),
-		},
-		{
-			name:     "context without response metadata key",
-			ctx:      context.Background(),
-			md:       metadata.Pairs("key1", "val1"),
-			expected: context.Background(),
-		},
-		{
-			name:     "context with nil response metadata value",
-			ctx:      context.WithValue(context.Background(), rspMetadataKey{}, nil),
-			md:       metadata.Pairs("key1", "val1"),
-			expected: context.WithValue(context.Background(), rspMetadataKey{}, nil),
-		},
-		{
-			name:     "context with incorrect type in response metadata value",
-			ctx:      context.WithValue(context.Background(), rspMetadataKey{}, struct{}{}),
-			md:       metadata.Pairs("key1", "val1"),
-			expected: context.WithValue(context.Background(), rspMetadataKey{}, struct{}{}),
-		},
-		{
-			name:     "context with response metadata value, but nil metadata",
-			ctx:      context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: nil}),
-			md:       metadata.Pairs("key1", "val1"),
-			expected: context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: nil}),
-		},
-		{
-			name: "basic metadata append",
-			ctx:  context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: metadata.Metadata{}}),
-			md:   metadata.Pairs("key1", "val1"),
-			expected: context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{
-				m: metadata.Metadata{
-					"key1": []string{"val1"},
-				},
-			}),
-		},
-		{
-			name: "multiple values for same key",
-			ctx:  context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: metadata.Metadata{}}),
-			md:   metadata.Pairs("key1", "val1", "key1", "val2"),
-			expected: context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{
-				m: metadata.Metadata{
-					"key1": []string{"val1", "val2"},
-				},
-			}),
-		},
-		{
-			name: "multiple values for different keys",
-			ctx:  context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: metadata.Metadata{}}),
-			md:   metadata.Pairs("key1", "val1", "key1", "val2", "key2", "val3", "key2", "val4", "key3", "val5"),
-			expected: context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{
-				m: metadata.Metadata{
-					"key1": []string{"val1", "val2"},
-					"key2": []string{"val3", "val4"},
-					"key3": []string{"val5"},
-				},
-			}),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			AppendResponseMetadata(tt.ctx, tt.md)
-			require.Equal(t, tt.expected, tt.ctx)
-		})
-	}
-}
-
-func TestGetResponseMetadata(t *testing.T) {
-	tests := []struct {
-		name     string
-		ctx      context.Context
-		expected metadata.Metadata
-	}{
-		{
-			name:     "context without response metadata key",
-			ctx:      context.Background(),
-			expected: nil,
-		},
-		{
-			name:     "context with nil response metadata value",
-			ctx:      context.WithValue(context.Background(), rspMetadataKey{}, nil),
-			expected: nil,
-		},
-		{
-			name:     "context with incorrect type in response metadata value",
-			ctx:      context.WithValue(context.Background(), rspMetadataKey{}, &struct{}{}),
-			expected: nil,
-		},
-		{
-			name:     "context with response metadata value, but nil metadata",
-			ctx:      context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{m: nil}),
-			expected: nil,
-		},
-		{
-			name: "valid metadata",
-			ctx: context.WithValue(context.Background(), rspMetadataKey{}, &rspMetadataVal{
-				m: metadata.Pairs("key1", "value1"),
-			}),
-			expected: metadata.Metadata{"key1": {"value1"}},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			require.Equal(t, tt.expected, getResponseMetadata(tt.ctx))
-		})
-	}
-}

options.go

@@ -31,6 +31,51 @@ func (err *Error) Error() string {
 	return fmt.Sprintf("%v", err.err)
 }
 
+type (
+	rspCodeKey struct{}
+	rspCodeVal struct {
+		code int
+	}
+)
+
+type (
+	rspHeaderKey struct{}
+	rspHeaderVal struct {
+		h http.Header
+	}
+)
+
+// SetRspHeader add response headers
+func SetRspHeader(ctx context.Context, h http.Header) {
+	if rsp, ok := ctx.Value(rspHeaderKey{}).(*rspHeaderVal); ok {
+		rsp.h = h
+	}
+}
+
+// SetRspCode saves response code in context, must be used by handler to specify http code
+func SetRspCode(ctx context.Context, code int) {
+	if rsp, ok := ctx.Value(rspCodeKey{}).(*rspCodeVal); ok {
+		rsp.code = code
+	}
+}
+
+// getRspHeader get http.Header from context
+func getRspHeader(ctx context.Context) http.Header {
+	if rsp, ok := ctx.Value(rspHeaderKey{}).(*rspHeaderVal); ok {
+		return rsp.h
+	}
+	return nil
+}
+
+// GetRspCode used internally by generated http server handler
+func GetRspCode(ctx context.Context) int {
+	var code int
+	if rsp, ok := ctx.Value(rspCodeKey{}).(*rspCodeVal); ok {
+		code = rsp.code
+	}
+	return code
+}
+
 type middlewareKey struct{}
 
 // Middleware passes http middlewares
@@ -88,13 +133,6 @@ func RegisterRPCHandler(b bool) server.Option {
 	return server.SetOption(registerRPCHandlerKey{}, b)
 }
 
-type registerCORSHandlerKey struct{}
-
-// RegisterCORSHandler registers cors endpoints with /ServiceName.ServiceEndpoint method POPTIONSOST
-func RegisterCORSHandler(b bool) server.HandlerOption {
-	return server.SetHandlerOption(registerCORSHandlerKey{}, b)
-}
-
 type handlerEndpointsKey struct{}
 
 type EndpointMetadata struct {

request.go

@@ -1,6 +1,8 @@
 package http
 
 import (
+	"io"
+
 	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/metadata"
 	"go.unistack.org/micro/v4/server"
@@ -9,7 +11,7 @@ import (
 var _ server.Request = &rpcRequest{}
 
 type rpcRequest struct {
-	// rw          io.ReadWriter
+	rw          io.ReadWriter
 	payload     interface{}
 	codec       codec.Codec
 	header      metadata.Metadata
@@ -45,7 +47,11 @@ func (r *rpcRequest) Header() metadata.Metadata {
 }
 
 func (r *rpcRequest) Read() ([]byte, error) {
-	return nil, nil
+	f := &codec.Frame{}
+	if err := r.codec.ReadBody(r.rw, f); err != nil {
+		return nil, err
+	}
+	return f.Data, nil
 }
 
 func (r *rpcRequest) Stream() bool {

response.go

@@ -1,29 +0,0 @@
-package http
-
-import (
-	"context"
-	"net/http"
-)
-
-type (
-	rspStatusCodeKey struct{}
-	rspStatusCodeVal struct {
-		code int
-	}
-)
-
-// SetResponseStatusCode sets the status code in the context.
-func SetResponseStatusCode(ctx context.Context, code int) {
-	if rsp, ok := ctx.Value(rspStatusCodeKey{}).(*rspStatusCodeVal); ok {
-		rsp.code = code
-	}
-}
-
-// GetResponseStatusCode retrieves the response status code from the context.
-func GetResponseStatusCode(ctx context.Context) int {
-	code := http.StatusOK
-	if rsp, ok := ctx.Value(rspStatusCodeKey{}).(*rspStatusCodeVal); ok {
-		code = rsp.code
-	}
-	return code
-}

response_test.go

@@ -1,79 +0,0 @@
-package http
-
-import (
-	"context"
-	"net/http"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestSetResponseStatusCode(t *testing.T) {
-	tests := []struct {
-		name     string
-		ctx      context.Context
-		code     int
-		expected context.Context
-	}{
-		{
-			name:     "context without response status code key",
-			ctx:      context.Background(),
-			code:     http.StatusOK,
-			expected: context.Background(),
-		},
-		{
-			name:     "context with incorrect type in response status code value",
-			ctx:      context.WithValue(context.Background(), rspStatusCodeKey{}, struct{}{}),
-			code:     http.StatusOK,
-			expected: context.WithValue(context.Background(), rspStatusCodeKey{}, struct{}{}),
-		},
-		{
-			name:     "successfully set response status code",
-			ctx:      context.WithValue(context.Background(), rspStatusCodeKey{}, &rspStatusCodeVal{}),
-			code:     http.StatusOK,
-			expected: context.WithValue(context.Background(), rspStatusCodeKey{}, &rspStatusCodeVal{code: http.StatusOK}),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			SetResponseStatusCode(tt.ctx, tt.code)
-			require.Equal(t, tt.expected, tt.ctx)
-		})
-	}
-}
-
-func TestGetResponseStatusCode(t *testing.T) {
-	tests := []struct {
-		name     string
-		ctx      context.Context
-		expected int
-	}{
-		{
-			name:     "no value in context, should return 200",
-			ctx:      context.Background(),
-			expected: http.StatusOK,
-		},
-		{
-			name:     "context with nil value",
-			ctx:      context.WithValue(context.Background(), rspStatusCodeKey{}, nil),
-			expected: http.StatusOK,
-		},
-		{
-			name:     "context with wrong type",
-			ctx:      context.WithValue(context.Background(), rspStatusCodeKey{}, struct{}{}),
-			expected: http.StatusOK,
-		},
-		{
-			name:     "context with valid status code",
-			ctx:      context.WithValue(context.Background(), rspStatusCodeKey{}, &rspStatusCodeVal{code: http.StatusNotFound}),
-			expected: http.StatusNotFound,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			require.Equal(t, tt.expected, GetResponseStatusCode(tt.ctx))
-		})
-	}
-}

util.go

@@ -15,52 +15,39 @@ func FillRequest(ctx context.Context, req interface{}, opts ...FillRequestOption
 	for _, o := range opts {
 		o(&options)
 	}
-
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
 		return nil
 	}
 
 	for idx := 0; idx < len(options.headers)/2; idx += 2 {
-		k := options.headers[idx]
-		v := md.Get(k)
-		if v == nil {
+		k := http.CanonicalHeaderKey(options.headers[idx])
+		v, ok := md[k]
+		if !ok {
 			continue
 		}
-
-		if len(v) == 1 {
-			err = rutil.SetFieldByPath(req, v[0], k)
-		} else {
-			err = rutil.SetFieldByPath(req, v, k)
-		}
-		if err != nil {
+		if err = rutil.SetFieldByPath(req, v, k); err != nil {
 			return err
 		}
 	}
 
-	cookieVals := md.Get("Cookie")
-	for i := range cookieVals {
-		cookies := strings.Split(cookieVals[i], ";")
-		cmd := make(map[string]string, len(cookies))
-		for _, cookie := range cookies {
-			kv := strings.Split(cookie, "=")
-			if len(kv) != 2 {
-				continue
-			}
-			cmd[strings.TrimSpace(kv[0])] = strings.TrimSpace(kv[1])
+	cookies := strings.Split(md["Cookie"], ";")
+	cmd := make(map[string]string, len(cookies))
+	for _, cookie := range cookies {
+		kv := strings.Split(cookie, "=")
+		if len(kv) != 2 {
+			continue
 		}
-		for idx := 0; idx < len(options.cookies)/2; idx += 2 {
-			k := http.CanonicalHeaderKey(options.cookies[idx])
-			v, ok := cmd[k]
-
-			if !ok {
-				continue
-			}
-
-			err = rutil.SetFieldByPath(req, v, k)
-			if err != nil {
-				return err
-			}
+		cmd[strings.TrimSpace(kv[0])] = strings.TrimSpace(kv[1])
+	}
+	for idx := 0; idx < len(options.cookies)/2; idx += 2 {
+		k := http.CanonicalHeaderKey(options.cookies[idx])
+		v, ok := cmd[k]
+		if !ok {
+			continue
+		}
+		if err = rutil.SetFieldByPath(req, v, k); err != nil {
+			return err
 		}
 	}
 

util_test.go

@@ -8,52 +8,8 @@ import (
 	"testing"
 
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/server"
 )
 
-func Test_Hook(t *testing.T) {
-	opts := server.Options{}
-
-	var fn server.HandlerFunc = func(fctx context.Context, req server.Request, rsp interface{}) (err error) {
-		// fmt.Println("1")
-		return nil
-	}
-
-	var fn2 server.HandlerWrapper = func(next server.HandlerFunc) server.HandlerFunc {
-		return func(ctx context.Context, req server.Request, rsp interface{}) error {
-			//	fmt.Println("2")
-			return next(ctx, req, rsp)
-		}
-	}
-	var fn3 server.HandlerWrapper = func(next server.HandlerFunc) server.HandlerFunc {
-		return func(ctx context.Context, req server.Request, rsp interface{}) error {
-			// fmt.Println("3")
-			return next(ctx, req, rsp)
-		}
-	}
-	var fn4 server.HandlerWrapper = func(next server.HandlerFunc) server.HandlerFunc {
-		return func(ctx context.Context, req server.Request, rsp interface{}) error {
-			// fmt.Println("4")
-			return next(ctx, req, rsp)
-		}
-	}
-
-	opts.Hooks = append(opts.Hooks, fn2, fn3, fn4)
-
-	opts.Hooks.EachNext(func(hook options.Hook) {
-		if h, ok := hook.(server.HandlerWrapper); ok {
-			// fmt.Printf("h %#+v\n", h)
-			fn = h(fn)
-		}
-	})
-
-	err := fn(nil, nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
 func TestFillrequest(t *testing.T) {
 	md := metadata.New(1)
 	md.Set("ClientID", "xxx")