Merge pull request 'add defaultConfigService' (#133) from devstigneev/micro-client-grpc:issue_132 into master

Reviewed-on: #133

.github/dependabot.yml

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

.github/renovate.json

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

.github/stale.sh

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

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

@@ -3,19 +3,20 @@ on:
  push:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        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.

.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/pr.yml

@@ -3,19 +3,20 @@ on:
   pull_request:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        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.

.gitignore

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

.golangci.yml

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

codec.go

@@ -3,11 +3,16 @@ package grpc
 import (
 	"io"
 
-	"github.com/unistack-org/micro/v3/codec"
+	"go.unistack.org/micro/v3/codec"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )
 
+var (
+	_ encoding.Codec = &wrapMicroCodec{}
+	_ codec.Codec    = &wrapGrpcCodec{}
+)
+
 type wrapStream struct{ grpc.ClientStream }
 
 func (w *wrapStream) Write(d []byte) (int, error) {
@@ -19,7 +24,7 @@ func (w *wrapStream) Write(d []byte) (int, error) {
 func (w *wrapStream) Read(d []byte) (int, error) {
 	m := &codec.Frame{}
 	err := w.ClientStream.RecvMsg(m)
-	d = m.Data
+	copy(d, m.Data)
 	return len(d), err
 }
 
@@ -29,26 +34,32 @@ func (w *wrapMicroCodec) Name() string {
 	return w.Codec.String()
 }
 
+func (w *wrapMicroCodec) Marshal(v interface{}) ([]byte, error) {
+	return w.Codec.Marshal(v)
+}
+
+func (w *wrapMicroCodec) Unmarshal(d []byte, v interface{}) error {
+	return w.Codec.Unmarshal(d, v)
+}
+
 type wrapGrpcCodec struct{ encoding.Codec }
 
 func (w *wrapGrpcCodec) String() string {
 	return w.Codec.Name()
 }
 
-func (w *wrapGrpcCodec) Marshal(v interface{}) ([]byte, error) {
+func (w *wrapGrpcCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
-	switch m := v.(type) {
+	if m, ok := v.(*codec.Frame); ok {
-	case *codec.Frame:
 		return m.Data, nil
 	}
 	return w.Codec.Marshal(v)
 }
 
-func (w wrapGrpcCodec) Unmarshal(d []byte, v interface{}) error {
+func (w *wrapGrpcCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
 	if d == nil || v == nil {
 		return nil
 	}
-	switch m := v.(type) {
+	if m, ok := v.(*codec.Frame); ok {
-	case *codec.Frame:
 		m.Data = d
 		return nil
 	}
@@ -69,7 +80,7 @@ type grpcCodec struct {
 
 */
 
-func (g *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.MessageType) error {
+func (w *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.MessageType) error {
 	/*
 		if m == nil {
 			m = codec.NewMessage(codec.Request)
@@ -92,20 +103,19 @@ func (g *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.Me
 	return nil
 }
 
-func (g *wrapGrpcCodec) ReadBody(conn io.Reader, v interface{}) error {
+func (w *wrapGrpcCodec) ReadBody(conn io.Reader, v interface{}) error {
 	// caller has requested a frame
-	switch m := v.(type) {
+	if m, ok := v.(*codec.Frame); ok {
-	case *codec.Frame:
 		_, err := conn.Read(m.Data)
 		return err
 	}
 	return codec.ErrInvalidMessage
 }
 
-func (g *wrapGrpcCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
+func (w *wrapGrpcCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
 	// if we don't have a body
 	if v != nil {
-		b, err := g.Marshal(v)
+		b, err := w.Marshal(v)
 		if err != nil {
 			return err
 		}

error.go

@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	"github.com/unistack-org/micro/v3/errors"
+	"go.unistack.org/micro/v3/errors"
 	"google.golang.org/grpc/status"
 )
 
@@ -9,31 +9,46 @@ func microError(err error) error {
 	// no error
 
 	if err == nil {
+		// nothing to do
 		return nil
 	}
 
 	if verr, ok := err.(*errors.Error); ok {
+		// micro error
 		return verr
 	}
 
 	// grpc error
 	s, ok := status.FromError(err)
 	if !ok {
+		// can't get status detals from grpc error, return base error
 		return err
 	}
 
-	// return first error from details
+	details := s.Details()
-	if details := s.Details(); len(details) > 0 {
+	switch len(details) {
-		if verr, ok := details[0].(error); ok {
+	case 0:
-			return microError(verr)
+		if verr := errors.Parse(s.Message()); verr.Code > 0 {
+			// return micro error
+			return verr
 		}
+		// return base error as it not micro error
+		return err
+	case 1:
+		if verr, ok := details[0].(*errors.Error); ok {
+			// return nested micro error
+			return verr
+		}
+		// return base error as it not holds micro error
+		return err
 	}
 
-	// try to decode micro *errors.Error
+	// attached messages in details more then 1, try to fallback to micro error
-	if e := errors.Parse(s.Message()); e.Code > 0 {
+	if verr := errors.Parse(s.Message()); verr.Code > 0 {
-		return e // actually a micro error
+		// return micro error
+		return verr
 	}
 
-	// fallback
+	// not micro error return base error
-	return errors.InternalServerError("go.micro.client", s.Message())
+	return err
 }

go.mod

@@ -1,13 +1,8 @@
-module github.com/unistack-org/micro-client-grpc/v3
+module go.unistack.org/micro-client-grpc/v3
 
 go 1.16
 
 require (
-	github.com/google/go-cmp v0.5.1 // indirect
+	go.unistack.org/micro/v3 v3.10.22
-	github.com/unistack-org/micro/v3 v3.3.13
+	google.golang.org/grpc v1.52.3
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
-	google.golang.org/grpc v1.37.0
 )
-
-//replace github.com/unistack-org/micro/v3 => ../../micro

grpc.go

@@ -1,51 +1,52 @@
 // Package grpc provides a gRPC client
-package grpc
+package grpc // import "go.unistack.org/micro-client-grpc/v3"
 
 import (
 	"context"
 	"crypto/tls"
 	"fmt"
 	"net"
+	"os"
 	"reflect"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"time"
 
-	"github.com/unistack-org/micro/v3/broker"
+	"go.unistack.org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v3/client"
-	"github.com/unistack-org/micro/v3/codec"
+	"go.unistack.org/micro/v3/codec"
-	"github.com/unistack-org/micro/v3/errors"
+	"go.unistack.org/micro/v3/errors"
-	"github.com/unistack-org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/selector"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/encoding"
 	gmetadata "google.golang.org/grpc/metadata"
 )
 
+const (
+	DefaultContentType = "application/grpc"
+)
+
 type grpcClient struct {
-	opts   client.Options
+	pool *ConnPool
-	codecs map[string]encoding.Codec
+	opts client.Options
-	pool   *pool
-	once   atomic.Value
-	init   bool
 	sync.RWMutex
+	init bool
 }
 
 // secure returns the dial option for whether its a secure or insecure connection
 func (g *grpcClient) secure(addr string) grpc.DialOption {
 	// first we check if theres'a  tls config
-	if g.opts.Context != nil {
+	if g.opts.TLSConfig != nil {
-		if v := g.opts.Context.Value(tlsAuth{}); v != nil {
+		creds := credentials.NewTLS(g.opts.TLSConfig)
-			tls := v.(*tls.Config)
+		// return tls config if it exists
-			creds := credentials.NewTLS(tls)
+		return grpc.WithTransportCredentials(creds)
-			// return tls config if it exists
-			return grpc.WithTransportCredentials(creds)
-		}
 	}
 
 	// default config
-	tlsConfig := &tls.Config{}
+	tlsConfig := &tls.Config{MinVersion: tls.VersionTLS12}
 	defaultCreds := grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig))
 
 	// check if the address is prepended with https
@@ -63,7 +64,7 @@ func (g *grpcClient) secure(addr string) grpc.DialOption {
 	}
 
 	// other fallback to insecure
-	return grpc.WithInsecure()
+	return grpc.WithTransportCredentials(insecure.NewCredentials())
 }
 
 func (g *grpcClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
@@ -77,11 +78,15 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 	} else {
 		header = make(map[string]string, 2)
 	}
-
+	if opts.RequestMetadata != nil {
+		for k, v := range opts.RequestMetadata {
+			header[k] = v
+		}
+	}
 	// set timeout in nanoseconds
-	header["timeout"] = fmt.Sprintf("%d", opts.RequestTimeout)
+	header["Grpc-Timeout"] = fmt.Sprintf("%dn", opts.RequestTimeout)
-	// set the content type for the request
+	header["timeout"] = fmt.Sprintf("%dn", opts.RequestTimeout)
-	header["x-content-type"] = req.ContentType()
+	header["content-type"] = req.ContentType()
 
 	md := gmetadata.New(header)
 	ctx = gmetadata.NewOutgoingContext(ctx, md)
@@ -93,6 +98,7 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 
 	maxRecvMsgSize := g.maxRecvMsgSizeValue()
 	maxSendMsgSize := g.maxSendMsgSizeValue()
+	cfgService := g.serviceConfig()
 
 	var grr error
 
@@ -111,30 +117,47 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 			grpc.MaxCallRecvMsgSize(maxRecvMsgSize),
 			grpc.MaxCallSendMsgSize(maxSendMsgSize),
 		),
+		grpc.WithDefaultServiceConfig(cfgService),
 	}
 
-	if opts := g.getGrpcDialOptions(); opts != nil {
+	if opts := g.getGrpcDialOptions(opts.Context); opts != nil {
 		grpcDialOptions = append(grpcDialOptions, opts...)
 	}
 
-	cc, err := g.pool.getConn(dialCtx, addr, grpcDialOptions...)
+	contextDialer := g.opts.ContextDialer
+	if opts.ContextDialer != nil {
+		contextDialer = opts.ContextDialer
+	}
+	if contextDialer != nil {
+		grpcDialOptions = append(grpcDialOptions, grpc.WithContextDialer(contextDialer))
+	}
+
+	cc, err := g.pool.Get(dialCtx, addr, grpcDialOptions...)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error sending request: %v", err))
 	}
 	defer func() {
 		// defer execution of release
-		g.pool.release(addr, cc, grr)
+		g.pool.Put(cc, grr)
 	}()
 
 	ch := make(chan error, 1)
+	var gmd gmetadata.MD
+
+	grpcCallOptions := []grpc.CallOption{
+		grpc.CallContentSubtype((&wrapMicroCodec{cf}).Name()),
+	}
+
+	if opts := g.getGrpcCallOptions(opts.Context); opts != nil {
+		grpcCallOptions = append(grpcCallOptions, opts...)
+	}
+
+	if opts.ResponseMetadata != nil {
+		gmd = gmetadata.MD{}
+		grpcCallOptions = append(grpcCallOptions, grpc.Header(&gmd))
+	}
 
 	go func() {
-		grpcCallOptions := []grpc.CallOption{
-			grpc.ForceCodec(&wrapMicroCodec{cf}),
-			grpc.CallContentSubtype((&wrapMicroCodec{cf}).Name())}
-		if opts := g.getGrpcCallOptions(); opts != nil {
-			grpcCallOptions = append(grpcCallOptions, opts...)
-		}
 		err := cc.Invoke(ctx, methodToGRPC(req.Service(), req.Endpoint()), req.Body(), rsp, grpcCallOptions...)
 		ch <- microError(err)
 	}()
@@ -146,6 +169,13 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 		grr = errors.Timeout("go.micro.client", "%v", ctx.Err())
 	}
 
+	if opts.ResponseMetadata != nil {
+		*opts.ResponseMetadata = metadata.New(gmd.Len())
+		for k, v := range gmd {
+			opts.ResponseMetadata.Set(k, strings.Join(v, ","))
+		}
+	}
+
 	return grr
 }
 
@@ -163,10 +193,11 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 
 	// set timeout in nanoseconds
 	if opts.StreamTimeout > time.Duration(0) {
-		header["timeout"] = fmt.Sprintf("%d", opts.StreamTimeout)
+		header["Grpc-Timeout"] = fmt.Sprintf("%dn", opts.StreamTimeout)
+		header["timeout"] = fmt.Sprintf("%dn", opts.StreamTimeout)
 	}
 	// set the content type for the request
-	header["x-content-type"] = req.ContentType()
+	header["content-type"] = req.ContentType()
 
 	md := gmetadata.New(header)
 	ctx = gmetadata.NewOutgoingContext(ctx, md)
@@ -187,15 +218,32 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 
 	wc := &wrapMicroCodec{cf}
 
+	maxRecvMsgSize := g.maxRecvMsgSizeValue()
+	maxSendMsgSize := g.maxSendMsgSizeValue()
+	cfgService := g.serviceConfig()
+
 	grpcDialOptions := []grpc.DialOption{
 		g.secure(addr),
+		grpc.WithDefaultCallOptions(
+			grpc.MaxCallRecvMsgSize(maxRecvMsgSize),
+			grpc.MaxCallSendMsgSize(maxSendMsgSize),
+		),
+		grpc.WithDefaultServiceConfig(cfgService),
 	}
 
-	if opts := g.getGrpcDialOptions(); opts != nil {
+	if opts := g.getGrpcDialOptions(opts.Context); opts != nil {
 		grpcDialOptions = append(grpcDialOptions, opts...)
 	}
 
-	cc, err := g.pool.getConn(dialCtx, addr, grpcDialOptions...)
+	contextDialer := g.opts.ContextDialer
+	if opts.ContextDialer != nil {
+		contextDialer = opts.ContextDialer
+	}
+	if contextDialer != nil {
+		grpcDialOptions = append(grpcDialOptions, grpc.WithContextDialer(contextDialer))
+	}
+
+	cc, err := g.pool.Get(dialCtx, addr, grpcDialOptions...)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error sending request: %v", err))
 	}
@@ -207,12 +255,17 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 	}
 
 	grpcCallOptions := []grpc.CallOption{
-		grpc.ForceCodec(wc),
+		// grpc.ForceCodec(wc),
 		grpc.CallContentSubtype(wc.Name()),
 	}
-	if opts := g.getGrpcCallOptions(); opts != nil {
+	if opts := g.getGrpcCallOptions(opts.Context); opts != nil {
 		grpcCallOptions = append(grpcCallOptions, opts...)
 	}
+	var gmd gmetadata.MD
+	if opts.ResponseMetadata != nil {
+		gmd = gmetadata.MD{}
+		grpcCallOptions = append(grpcCallOptions, grpc.Header(&gmd))
+	}
 
 	// create a new cancelling context
 	newCtx, cancel := context.WithCancel(ctx)
@@ -223,7 +276,7 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 		// cancel the context
 		cancel()
 		// release the connection
-		g.pool.release(addr, cc, err)
+		g.pool.Put(cc, err)
 		// now return the error
 		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error creating stream: %v", err))
 	}
@@ -245,19 +298,20 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 		},
 		conn: cc,
 		close: func(err error) {
-			// cancel the context if an error occured
+			// cancel the context if an error occurred
 			if err != nil {
 				cancel()
 			}
 
 			// defer execution of release
-			g.pool.release(addr, cc, err)
+			g.pool.Put(cc, err)
 		},
 	}
 
 	// set the stream as the response
 	val := reflect.ValueOf(rsp).Elem()
 	val.Set(reflect.ValueOf(stream).Elem())
+
 	return nil
 }
 
@@ -319,6 +373,17 @@ func (g *grpcClient) newCodec(ct string) (codec.Codec, error) {
 	return nil, codec.ErrUnknownContentType
 }
 
+func (g *grpcClient) serviceConfig() string {
+	if g.opts.Context == nil {
+		return DefaultServiceConfig
+	}
+	v := g.opts.Context.Value(serviceConfigKey{})
+	if v == nil {
+		return DefaultServiceConfig
+	}
+	return v.(string)
+}
+
 func (g *grpcClient) Init(opts ...client.Option) error {
 	if len(opts) == 0 && g.init {
 		return nil
@@ -382,6 +447,7 @@ func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface
 	}
 	// make a copy of call opts
 	callOpts := g.opts.CallOptions
+
 	for _, opt := range opts {
 		opt(&callOpts)
 	}
@@ -430,20 +496,8 @@ func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface
 		callOpts.Address = []string{g.opts.Proxy}
 	}
 
-	// lookup the route to send the reques to
+	var next selector.Next
-	// TODO apply any filtering here
-	routes, err := g.opts.Lookup(ctx, req, callOpts)
-	if err != nil {
-		return errors.InternalServerError("go.micro.client", err.Error())
-	}
 
-	// balance the list of nodes
-	next, err := callOpts.Selector.Select(routes)
-	if err != nil {
-		return err
-	}
-
-	// return errors.New("go.micro.client", "request timeout", 408)
 	call := func(i int) error {
 		// call backoff first. Someone may want an initial start delay
 		t, err := callOpts.Backoff(ctx, req, i)
@@ -456,6 +510,23 @@ func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface
 			time.Sleep(t)
 		}
 
+		if next == nil {
+			var routes []string
+
+			// lookup the route to send the reques to
+			// TODO apply any filtering here
+			routes, err = g.opts.Lookup(ctx, req, callOpts)
+			if err != nil {
+				return errors.InternalServerError("go.micro.client", err.Error())
+			}
+
+			// balance the list of nodes
+			next, err = callOpts.Selector.Select(routes)
+			if err != nil {
+				return err
+			}
+		}
+
 		// get the next node
 		node := next()
 
@@ -547,18 +618,7 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
 		callOpts.Address = []string{g.opts.Proxy}
 	}
 
-	// lookup the route to send the reques to
+	var next selector.Next
-	// TODO: move to internal lookup func
-	routes, err := g.opts.Lookup(ctx, req, callOpts)
-	if err != nil {
-		return nil, errors.InternalServerError("go.micro.client", err.Error())
-	}
-
-	// balance the list of nodes
-	next, err := callOpts.Selector.Select(routes)
-	if err != nil {
-		return nil, err
-	}
 
 	call := func(i int) (client.Stream, error) {
 		// call backoff first. Someone may want an initial start delay
@@ -572,6 +632,23 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
 			time.Sleep(t)
 		}
 
+		if next == nil {
+			var routes []string
+
+			// lookup the route to send the reques to
+			// TODO apply any filtering here
+			routes, err = g.opts.Lookup(ctx, req, callOpts)
+			if err != nil {
+				return nil, errors.InternalServerError("go.micro.client", err.Error())
+			}
+
+			// balance the list of nodes
+			next, err = callOpts.Selector.Select(routes)
+			if err != nil {
+				return nil, err
+			}
+		}
+
 		// get the next node
 		node := next()
 
@@ -635,46 +712,69 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
 	return nil, grr
 }
 
+func (g *grpcClient) BatchPublish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
+	return g.publish(ctx, ps, opts...)
+}
+
 func (g *grpcClient) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
+	return g.publish(ctx, []client.Message{p}, opts...)
+}
+
+func (g *grpcClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
 	var body []byte
 
 	options := client.NewPublishOptions(opts...)
 
-	md, ok := metadata.FromOutgoingContext(ctx)
+	// get proxy
+	exchange := ""
+	if v, ok := os.LookupEnv("MICRO_PROXY"); ok {
+		exchange = v
+	}
+
+	msgs := make([]*broker.Message, 0, len(ps))
+
+	omd, ok := metadata.FromOutgoingContext(ctx)
 	if !ok {
-		md = metadata.New(2)
+		omd = metadata.New(2)
 	}
-	md["Content-Type"] = p.ContentType()
-	md["Micro-Topic"] = p.Topic()
 
-	// passed in raw data
+	for _, p := range ps {
-	if d, ok := p.Payload().(*codec.Frame); ok {
+		md := metadata.Copy(omd)
-		body = d.Data
+		md[metadata.HeaderContentType] = p.ContentType()
-	} else {
+
-		// use codec for payload
+		// passed in raw data
-		cf, err := g.newCodec(p.ContentType())
+		if d, ok := p.Payload().(*codec.Frame); ok {
-		if err != nil {
+			body = d.Data
-			return errors.InternalServerError("go.micro.client", err.Error())
+		} else {
+			// use codec for payload
+			cf, err := g.newCodec(p.ContentType())
+			if err != nil {
+				return errors.InternalServerError("go.micro.client", err.Error())
+			}
+			// set the body
+			b, err := cf.Marshal(p.Payload())
+			if err != nil {
+				return errors.InternalServerError("go.micro.client", err.Error())
+			}
+			body = b
 		}
-		// set the body
+
-		b, err := cf.Marshal(p.Payload())
+		topic := p.Topic()
-		if err != nil {
+		if len(exchange) > 0 {
-			return errors.InternalServerError("go.micro.client", err.Error())
+			topic = exchange
 		}
-		body = b
+
+		for k, v := range p.Metadata() {
+			md.Set(k, v)
+		}
+		md.Set(metadata.HeaderTopic, topic)
+		msgs = append(msgs, &broker.Message{Header: md, Body: body})
 	}
 
-	topic := p.Topic()
+	return g.opts.Broker.BatchPublish(ctx, msgs,
-
+		broker.PublishContext(options.Context),
-	// get the exchange
+		broker.PublishBodyOnly(options.BodyOnly),
-	if len(options.Exchange) > 0 {
+	)
-		topic = options.Exchange
-	}
-
-	return g.opts.Broker.Publish(metadata.NewOutgoingContext(ctx, md), topic, &broker.Message{
-		Header: md,
-		Body:   body,
-	}, broker.PublishContext(options.Context))
 }
 
 func (g *grpcClient) String() string {
@@ -685,41 +785,45 @@ func (g *grpcClient) Name() string {
 	return g.opts.Name
 }
 
-func (g *grpcClient) getGrpcDialOptions() []grpc.DialOption {
+func (g *grpcClient) getGrpcDialOptions(ctx context.Context) []grpc.DialOption {
-	if g.opts.CallOptions.Context == nil {
+	var opts []grpc.DialOption
-		return nil
+
+	if g.opts.CallOptions.Context != nil {
+		if v := g.opts.CallOptions.Context.Value(grpcDialOptions{}); v != nil {
+			if vopts, ok := v.([]grpc.DialOption); ok {
+				opts = append(opts, vopts...)
+			}
+		}
 	}
 
-	v := g.opts.CallOptions.Context.Value(grpcDialOptions{})
+	if ctx != nil {
-
+		if v := ctx.Value(grpcDialOptions{}); v != nil {
-	if v == nil {
+			if vopts, ok := v.([]grpc.DialOption); ok {
-		return nil
+				opts = append(opts, vopts...)
-	}
+			}
-
+		}
-	opts, ok := v.([]grpc.DialOption)
-
-	if !ok {
-		return nil
 	}
 
 	return opts
 }
 
-func (g *grpcClient) getGrpcCallOptions() []grpc.CallOption {
+func (g *grpcClient) getGrpcCallOptions(ctx context.Context) []grpc.CallOption {
-	if g.opts.CallOptions.Context == nil {
+	var opts []grpc.CallOption
-		return nil
+
+	if g.opts.CallOptions.Context != nil {
+		if v := g.opts.CallOptions.Context.Value(grpcCallOptions{}); v != nil {
+			if vopts, ok := v.([]grpc.CallOption); ok {
+				opts = append(opts, vopts...)
+			}
+		}
 	}
 
-	v := g.opts.CallOptions.Context.Value(grpcCallOptions{})
+	if ctx != nil {
-
+		if v := ctx.Value(grpcCallOptions{}); v != nil {
-	if v == nil {
+			if vopts, ok := v.([]grpc.CallOption); ok {
-		return nil
+				opts = append(opts, vopts...)
-	}
+			}
-
+		}
-	opts, ok := v.([]grpc.CallOption)
-
-	if !ok {
-		return nil
 	}
 
 	return opts
@@ -728,14 +832,15 @@ func (g *grpcClient) getGrpcCallOptions() []grpc.CallOption {
 func NewClient(opts ...client.Option) client.Client {
 	options := client.NewOptions(opts...)
 	// default content type for grpc
-	options.ContentType = "application/grpc+proto"
+	if options.ContentType == "" {
+		options.ContentType = DefaultContentType
+	}
 
 	rc := &grpcClient{
 		opts: options,
 	}
 
-	rc.pool = newPool(options.PoolSize, options.PoolTTL, rc.poolMaxIdle(), rc.poolMaxStreams())
+	rc.pool = NewConnPool(options.PoolSize, options.PoolTTL, rc.poolMaxIdle(), rc.poolMaxStreams())
-
 	c := client.Client(rc)
 
 	// wrap in reverse

grpc_pool.go

@@ -2,6 +2,7 @@ package grpc
 
 import (
 	"context"
+	"strings"
 	"sync"
 	"time"
 
@@ -9,56 +10,47 @@ import (
 	"google.golang.org/grpc/connectivity"
 )
 
-type pool struct {
+type ConnPool struct {
-	size int
+	conns      map[string]*streamsPool
-	ttl  int64
+	size       int
-
+	ttl        int64
-	//  max streams on a *poolConn
 	maxStreams int
-	//  max idle conns
+	maxIdle    int
-	maxIdle int
-
 	sync.Mutex
-	conns map[string]*streamsPool
 }
 
 type streamsPool struct {
 	//  head of list
-	head *poolConn
+	head *PoolConn
 	//  busy conns list
-	busy *poolConn
+	busy *PoolConn
 	//  the siza of list
 	count int
 	//  idle conn
 	idle int
 }
 
-type poolConn struct {
+type PoolConn struct {
-	//  grpc conn
+	err error
 	*grpc.ClientConn
-	err  error
+	next    *PoolConn
-	addr string
+	pool    *ConnPool
-
-	//  pool and streams pool
-	pool    *pool
 	sp      *streamsPool
+	pre     *PoolConn
+	addr    string
 	streams int
 	created int64
-
+	in      bool
-	//  list
-	pre  *poolConn
-	next *poolConn
-	in   bool
 }
 
-func newPool(size int, ttl time.Duration, idle int, ms int) *pool {
+func NewConnPool(size int, ttl time.Duration, idle int, ms int) *ConnPool {
 	if ms <= 0 {
 		ms = 1
 	}
 	if idle < 0 {
 		idle = 0
 	}
-	return &pool{
+	return &ConnPool{
 		size:       size,
 		ttl:        int64(ttl.Seconds()),
 		maxStreams: ms,
@@ -67,12 +59,15 @@ func newPool(size int, ttl time.Duration, idle int, ms int) *pool {
 	}
 }
 
-func (p *pool) getConn(ctx context.Context, addr string, opts ...grpc.DialOption) (*poolConn, error) {
+func (p *ConnPool) Get(ctx context.Context, addr string, opts ...grpc.DialOption) (*PoolConn, error) {
+	if strings.HasPrefix(addr, "http") {
+		addr = addr[strings.Index(addr, ":")+3:]
+	}
 	now := time.Now().Unix()
 	p.Lock()
 	sp, ok := p.conns[addr]
 	if !ok {
-		sp = &streamsPool{head: &poolConn{}, busy: &poolConn{}, count: 0, idle: 0}
+		sp = &streamsPool{head: &PoolConn{}, busy: &PoolConn{}, count: 0, idle: 0}
 		p.conns[addr] = sp
 	}
 	//  while we have conns check streams and then return one
@@ -135,12 +130,12 @@ func (p *pool) getConn(ctx context.Context, addr string, opts ...grpc.DialOption
 	}
 	p.Unlock()
 
-	//  create new conn
+	//  create new conn)
 	cc, err := grpc.DialContext(ctx, addr, opts...)
 	if err != nil {
 		return nil, err
 	}
-	conn = &poolConn{cc, nil, addr, p, sp, 1, time.Now().Unix(), nil, nil, false}
+	conn = &PoolConn{ClientConn: cc, err: nil, addr: addr, pool: p, sp: sp, streams: 1, created: time.Now().Unix(), pre: nil, next: nil, in: false}
 
 	//  add conn to streams pool
 	p.Lock()
@@ -152,7 +147,7 @@ func (p *pool) getConn(ctx context.Context, addr string, opts ...grpc.DialOption
 	return conn, nil
 }
 
-func (p *pool) release(addr string, conn *poolConn, err error) {
+func (p *ConnPool) Put(conn *PoolConn, err error) {
 	p.Lock()
 	p, sp, created := conn.pool, conn.sp, conn.created
 	//  try to add conn
@@ -187,11 +182,11 @@ func (p *pool) release(addr string, conn *poolConn, err error) {
 	p.Unlock()
 }
 
-func (conn *poolConn) Close() {
+func (conn *PoolConn) Close() {
-	conn.pool.release(conn.addr, conn, conn.err)
+	conn.pool.Put(conn, conn.err)
 }
 
-func removeConn(conn *poolConn) {
+func removeConn(conn *PoolConn) {
 	if conn.pre != nil {
 		conn.pre.next = conn.next
 	}
@@ -204,7 +199,7 @@ func removeConn(conn *poolConn) {
 	conn.sp.count--
 }
 
-func addConnAfter(conn *poolConn, after *poolConn) {
+func addConnAfter(conn *PoolConn, after *PoolConn) {
 	conn.next = after.next
 	conn.pre = after
 	if after.next != nil {

message.go

@@ -1,20 +1,19 @@
 package grpc
 
 import (
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v3/metadata"
 )
 
 type grpcEvent struct {
+	payload     interface{}
 	topic       string
 	contentType string
-	payload     interface{}
+	opts        client.MessageOptions
 }
 
 func newGRPCEvent(topic string, payload interface{}, contentType string, opts ...client.MessageOption) client.Message {
-	var options client.MessageOptions
+	options := client.NewMessageOptions(opts...)
-	for _, o := range opts {
-		o(&options)
-	}
 
 	if len(options.ContentType) > 0 {
 		contentType = options.ContentType
@@ -24,6 +23,7 @@ func newGRPCEvent(topic string, payload interface{}, contentType string, opts ..
 		payload:     payload,
 		topic:       topic,
 		contentType: contentType,
+		opts:        options,
 	}
 }
 
@@ -38,3 +38,7 @@ func (g *grpcEvent) Topic() string {
 func (g *grpcEvent) Payload() interface{} {
 	return g.payload
 }
+
+func (g *grpcEvent) Metadata() metadata.Metadata {
+	return g.opts.Metadata
+}

options.go

@@ -3,15 +3,14 @@ package grpc
 
 import (
 	"context"
-	"crypto/tls"
 
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v3/client"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )
 
 var (
-	// DefaultPoolMaxStreams maximum streams on a connectioin
+	// DefaultPoolMaxStreams maximum streams on a connection
 	// (20)
 	DefaultPoolMaxStreams = 20
 
@@ -26,16 +25,12 @@ var (
 	// DefaultMaxSendMsgSize maximum message that client can send
 	// (4 MB).
 	DefaultMaxSendMsgSize = 1024 * 1024 * 4
+
+	// DefaultServiceConfig enable load balancing
+	DefaultServiceConfig = `{"loadBalancingPolicy":"round_robin"}`
 )
 
 type poolMaxStreams struct{}
-type poolMaxIdle struct{}
-type codecsKey struct{}
-type tlsAuth struct{}
-type maxRecvMsgSizeKey struct{}
-type maxSendMsgSizeKey struct{}
-type grpcDialOptions struct{}
-type grpcCallOptions struct{}
 
 // maximum streams on a connectioin
 func PoolMaxStreams(n int) client.Option {
@@ -47,6 +42,8 @@ func PoolMaxStreams(n int) client.Option {
 	}
 }
 
+type poolMaxIdle struct{}
+
 // maximum idle conns of a pool
 func PoolMaxIdle(d int) client.Option {
 	return func(o *client.Options) {
@@ -57,6 +54,8 @@ func PoolMaxIdle(d int) client.Option {
 	}
 }
 
+type codecsKey struct{}
+
 // gRPC Codec to be used to encode/decode requests for a given content type
 func Codec(contentType string, c encoding.Codec) client.Option {
 	return func(o *client.Options) {
@@ -72,19 +71,9 @@ func Codec(contentType string, c encoding.Codec) client.Option {
 	}
 }
 
-// AuthTLS should be used to setup a secure authentication using TLS
+type maxRecvMsgSizeKey struct{}
-func AuthTLS(t *tls.Config) client.Option {
-	return func(o *client.Options) {
-		if o.Context == nil {
-			o.Context = context.Background()
-		}
-		o.Context = context.WithValue(o.Context, tlsAuth{}, t)
-	}
-}
 
-//
 // MaxRecvMsgSize set the maximum size of message that client can receive.
-//
 func MaxRecvMsgSize(s int) client.Option {
 	return func(o *client.Options) {
 		if o.Context == nil {
@@ -94,9 +83,9 @@ func MaxRecvMsgSize(s int) client.Option {
 	}
 }
 
-//
+type maxSendMsgSizeKey struct{}
+
 // MaxSendMsgSize set the maximum size of message that client can send.
-//
 func MaxSendMsgSize(s int) client.Option {
 	return func(o *client.Options) {
 		if o.Context == nil {
@@ -106,9 +95,9 @@ func MaxSendMsgSize(s int) client.Option {
 	}
 }
 
-//
+type grpcDialOptions struct{}
+
 // DialOptions to be used to configure gRPC dial options
-//
 func DialOptions(opts ...grpc.DialOption) client.CallOption {
 	return func(o *client.CallOptions) {
 		if o.Context == nil {
@@ -118,9 +107,9 @@ func DialOptions(opts ...grpc.DialOption) client.CallOption {
 	}
 }
 
-//
+type grpcCallOptions struct{}
+
 // CallOptions to be used to configure gRPC call options
-//
 func CallOptions(opts ...grpc.CallOption) client.CallOption {
 	return func(o *client.CallOptions) {
 		if o.Context == nil {
@@ -129,3 +118,14 @@ func CallOptions(opts ...grpc.CallOption) client.CallOption {
 		o.Context = context.WithValue(o.Context, grpcCallOptions{}, opts)
 	}
 }
+
+type serviceConfigKey struct{}
+
+func ServiceConfig(str string) client.CallOption {
+	return func(options *client.CallOptions) {
+		if options.Context == nil {
+			options.Context = context.Background()
+		}
+		options.Context = context.WithValue(options.Context, serviceConfigKey{}, str)
+	}
+}

request.go

@@ -4,17 +4,17 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v3/client"
-	"github.com/unistack-org/micro/v3/codec"
+	"go.unistack.org/micro/v3/codec"
 )
 
 type grpcRequest struct {
+	request     interface{}
+	codec       codec.Codec
 	service     string
 	method      string
 	contentType string
-	request     interface{}
 	opts        client.RequestOptions
-	codec       codec.Codec
 }
 
 // service Struct.Method /service.Struct/Method
@@ -38,15 +38,12 @@ func methodToGRPC(service, method string) string {
 	return fmt.Sprintf("/%s.%s/%s", service, mParts[0], mParts[1])
 }
 
-func newGRPCRequest(service, method string, request interface{}, contentType string, reqOpts ...client.RequestOption) client.Request {
+func newGRPCRequest(service, method string, request interface{}, contentType string, opts ...client.RequestOption) client.Request {
-	var opts client.RequestOptions
+	options := client.NewRequestOptions(opts...)
-	for _, o := range reqOpts {
-		o(&opts)
-	}
 
 	// set the content-type specified
-	if len(opts.ContentType) > 0 {
+	if len(options.ContentType) > 0 {
-		contentType = opts.ContentType
+		contentType = options.ContentType
 	}
 
 	return &grpcRequest{
@@ -54,7 +51,7 @@ func newGRPCRequest(service, method string, request interface{}, contentType str
 		method:      method,
 		request:     request,
 		contentType: contentType,
-		opts:        opts,
+		opts:        options,
 	}
 }
 

response.go

@@ -3,13 +3,13 @@ package grpc
 import (
 	"strings"
 
-	"github.com/unistack-org/micro/v3/codec"
+	"go.unistack.org/micro/v3/codec"
-	"github.com/unistack-org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/metadata"
 	"google.golang.org/grpc"
 )
 
 type response struct {
-	conn   *poolConn
+	conn   *PoolConn
 	stream grpc.ClientStream
 	codec  codec.Codec
 }
@@ -23,7 +23,7 @@ func (r *response) Codec() codec.Codec {
 func (r *response) Header() metadata.Metadata {
 	meta, err := r.stream.Header()
 	if err != nil {
-		return metadata.New(0)
+		return nil
 	}
 	md := metadata.New(len(meta))
 	for k, v := range meta {

stream.go

@@ -5,23 +5,21 @@ import (
 	"io"
 	"sync"
 
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v3/client"
 	"google.golang.org/grpc"
 )
 
 // Implements the streamer interface
 type grpcStream struct {
-	// embed so we can access if need be
 	grpc.ClientStream
-
+	context  context.Context
-	sync.RWMutex
-	closed   bool
 	err      error
-	conn     *poolConn
 	request  client.Request
 	response client.Response
-	context  context.Context
 	close    func(err error)
+	conn     *PoolConn
+	sync.RWMutex
+	closed bool
 }
 
 func (g *grpcStream) Context() context.Context {
@@ -44,6 +42,14 @@ func (g *grpcStream) Send(msg interface{}) error {
 	return nil
 }
 
+func (g *grpcStream) SendMsg(msg interface{}) error {
+	if err := g.ClientStream.SendMsg(msg); err != nil {
+		g.setError(err)
+		return err
+	}
+	return nil
+}
+
 func (g *grpcStream) Recv(msg interface{}) (err error) {
 	defer g.setError(err)
 
@@ -62,6 +68,24 @@ func (g *grpcStream) Recv(msg interface{}) (err error) {
 	return
 }
 
+func (g *grpcStream) RecvMsg(msg interface{}) (err error) {
+	defer g.setError(err)
+
+	if err = g.ClientStream.RecvMsg(msg); err != nil {
+		// #202 - inconsistent gRPC stream behavior
+		// the only way to tell if the stream is done is when we get a EOF on the Recv
+		// here we should close the underlying gRPC ClientConn
+		closeErr := g.Close()
+		if err == io.EOF && closeErr != nil {
+			err = closeErr
+		}
+
+		return err
+	}
+
+	return
+}
+
 func (g *grpcStream) Error() error {
 	g.RLock()
 	defer g.RUnlock()
@@ -92,3 +116,17 @@ func (g *grpcStream) Close() error {
 	g.close(g.err)
 	return g.ClientStream.CloseSend()
 }
+
+func (g *grpcStream) CloseSend() error {
+	g.Lock()
+	defer g.Unlock()
+
+	if g.closed {
+		return nil
+	}
+
+	// close the connection
+	g.closed = true
+	g.close(g.err)
+	return g.ClientStream.CloseSend()
+}