.github/dependabot.yml

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

.github/renovate.json

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

.github/workflows/autoapprove.yml

@@ -1,20 +0,0 @@
-name: "autoapprove"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  autoapprove:
-    runs-on: ubuntu-latest
-    steps:
-      - name: approve
-        uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
-        id: approve
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -1,21 +0,0 @@
-name: "automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'vtolstov'
-    steps:
-      - name: merge
-        id: merge
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/build.yml

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

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

.github/workflows/dependabot-automerge.yml

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

.github/workflows/pr.yml

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

@@ -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

codec.go

@@ -3,16 +3,11 @@ package grpc
 import (
 	"io"
 
-	"go.unistack.org/micro/v3/codec"
+	"github.com/unistack-org/micro/v3/codec"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )
 
-var (
-	_ encoding.Codec = &wrapMicroCodec{}
-	_ codec.Codec    = &wrapGrpcCodec{}
-)
-
 type wrapStream struct{ grpc.ClientStream }
 
 func (w *wrapStream) Write(d []byte) (int, error) {
@@ -24,7 +19,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)
-	copy(d, m.Data)
+	d = m.Data
 	return len(d), err
 }
 
@@ -34,28 +29,20 @@ func (w *wrapMicroCodec) Name() string {
 	return w.Codec.String()
 }
 
-func (w *wrapMicroCodec) Marshal(v interface{}) ([]byte, error) {
-	return w.Codec.Marshal(v)
-}
-
-func (w *wrapMicroCodec) Unmarshal(d []byte, v interface{}) error {
-	return w.Codec.Unmarshal(d, v)
-}
-
 type wrapGrpcCodec struct{ encoding.Codec }
 
 func (w *wrapGrpcCodec) String() string {
 	return w.Codec.Name()
 }
 
-func (w *wrapGrpcCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
+func (w *wrapGrpcCodec) Marshal(v interface{}) ([]byte, error) {
 	if m, ok := v.(*codec.Frame); ok {
 		return m.Data, nil
 	}
 	return w.Codec.Marshal(v)
 }
 
-func (w *wrapGrpcCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
+func (w *wrapGrpcCodec) Unmarshal(d []byte, v interface{}) error {
 	if d == nil || v == nil {
 		return nil
 	}

error.go

@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	"go.unistack.org/micro/v3/errors"
+	"github.com/unistack-org/micro/v3/errors"
 	"google.golang.org/grpc/status"
 )
 
@@ -9,46 +9,31 @@ 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
 	}
 
-	details := s.Details()
+	// return first error from details
-	switch len(details) {
+	if details := s.Details(); len(details) > 0 {
-	case 0:
+		if verr, ok := details[0].(error); ok {
-		if verr := errors.Parse(s.Message()); verr.Code > 0 {
+			return microError(verr)
-			// 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
 	}
 
-	// attached messages in details more then 1, try to fallback to micro error
+	// try to decode micro *errors.Error
-	if verr := errors.Parse(s.Message()); verr.Code > 0 {
+	if e := errors.Parse(s.Message()); e.Code > 0 {
-		// return micro error
+		return e // actually a micro error
-		return verr
 	}
 
-	// not micro error return base error
+	// fallback
-	return err
+	return errors.InternalServerError("go.micro.client", s.Message())
 }

go.mod

@@ -1,8 +1,13 @@
-module go.unistack.org/micro-client-grpc/v3
+module github.com/unistack-org/micro-client-grpc/v3
 
 go 1.16
 
 require (
-	go.unistack.org/micro/v3 v3.10.22
+	github.com/google/go-cmp v0.5.1 // indirect
-	google.golang.org/grpc v1.52.3
+	github.com/unistack-org/micro/v3 v3.3.16
+	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,39 +1,32 @@
 // Package grpc provides a gRPC client
-package grpc // import "go.unistack.org/micro-client-grpc/v3"
+package grpc
 
 import (
 	"context"
 	"crypto/tls"
 	"fmt"
 	"net"
-	"os"
 	"reflect"
 	"strings"
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v3/broker"
+	"github.com/unistack-org/micro/v3/broker"
-	"go.unistack.org/micro/v3/client"
+	"github.com/unistack-org/micro/v3/client"
-	"go.unistack.org/micro/v3/codec"
+	"github.com/unistack-org/micro/v3/codec"
-	"go.unistack.org/micro/v3/errors"
+	"github.com/unistack-org/micro/v3/errors"
-	"go.unistack.org/micro/v3/metadata"
+	"github.com/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 {
-	pool *ConnPool
 	opts client.Options
-	sync.RWMutex
+	pool *pool
 	init bool
+	sync.RWMutex
 }
 
 // secure returns the dial option for whether its a secure or insecure connection
@@ -64,7 +57,7 @@ func (g *grpcClient) secure(addr string) grpc.DialOption {
 	}
 
 	// other fallback to insecure
-	return grpc.WithTransportCredentials(insecure.NewCredentials())
+	return grpc.WithInsecure()
 }
 
 func (g *grpcClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
@@ -78,15 +71,11 @@ 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["Grpc-Timeout"] = fmt.Sprintf("%dn", opts.RequestTimeout)
+	header["timeout"] = fmt.Sprintf("%d", opts.RequestTimeout)
-	header["timeout"] = fmt.Sprintf("%dn", opts.RequestTimeout)
+	// set the content type for the request
-	header["content-type"] = req.ContentType()
+	header["x-content-type"] = req.ContentType()
 
 	md := gmetadata.New(header)
 	ctx = gmetadata.NewOutgoingContext(ctx, md)
@@ -98,7 +87,6 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 
 	maxRecvMsgSize := g.maxRecvMsgSizeValue()
 	maxSendMsgSize := g.maxSendMsgSizeValue()
-	cfgService := g.serviceConfig()
 
 	var grr error
 
@@ -117,47 +105,31 @@ 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.Context); opts != nil {
+	if opts := g.getGrpcDialOptions(); opts != nil {
 		grpcDialOptions = append(grpcDialOptions, opts...)
 	}
 
-	contextDialer := g.opts.ContextDialer
+	cc, err := g.pool.getConn(dialCtx, addr, grpcDialOptions...)
-	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.Put(cc, grr)
+		g.pool.release(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)
 	}()
@@ -169,13 +141,6 @@ 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
 }
 
@@ -193,11 +158,10 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 
 	// set timeout in nanoseconds
 	if opts.StreamTimeout > time.Duration(0) {
-		header["Grpc-Timeout"] = fmt.Sprintf("%dn", opts.StreamTimeout)
+		header["timeout"] = fmt.Sprintf("%d", opts.StreamTimeout)
-		header["timeout"] = fmt.Sprintf("%dn", opts.StreamTimeout)
 	}
 	// set the content type for the request
-	header["content-type"] = req.ContentType()
+	header["x-content-type"] = req.ContentType()
 
 	md := gmetadata.New(header)
 	ctx = gmetadata.NewOutgoingContext(ctx, md)
@@ -218,32 +182,15 @@ 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.Context); opts != nil {
+	if opts := g.getGrpcDialOptions(); opts != nil {
 		grpcDialOptions = append(grpcDialOptions, opts...)
 	}
 
-	contextDialer := g.opts.ContextDialer
+	cc, err := g.pool.getConn(dialCtx, addr, grpcDialOptions...)
-	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))
 	}
@@ -255,17 +202,12 @@ 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.Context); opts != nil {
+	if opts := g.getGrpcCallOptions(); 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)
@@ -276,7 +218,7 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 		// cancel the context
 		cancel()
 		// release the connection
-		g.pool.Put(cc, err)
+		g.pool.release(cc, err)
 		// now return the error
 		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error creating stream: %v", err))
 	}
@@ -304,14 +246,13 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 			}
 
 			// defer execution of release
-			g.pool.Put(cc, err)
+			g.pool.release(cc, err)
 		},
 	}
 
 	// set the stream as the response
 	val := reflect.ValueOf(rsp).Elem()
 	val.Set(reflect.ValueOf(stream).Elem())
-
 	return nil
 }
 
@@ -373,17 +314,6 @@ 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
@@ -447,7 +377,6 @@ 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)
 	}
@@ -496,8 +425,20 @@ func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface
 		callOpts.Address = []string{g.opts.Proxy}
 	}
 
-	var next selector.Next
+	// 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
+	}
+
+	// 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)
@@ -510,23 +451,6 @@ 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()
 
@@ -618,7 +542,18 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
 		callOpts.Address = []string{g.opts.Proxy}
 	}
 
-	var next selector.Next
+	// lookup the route to send the reques to
+	// 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
@@ -632,23 +567,6 @@ 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()
 
@@ -712,35 +630,17 @@ 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...)
 
-	// get proxy
+	md, ok := metadata.FromOutgoingContext(ctx)
-	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 {
-		omd = metadata.New(2)
+		md = metadata.New(2)
 	}
-
+	md["Content-Type"] = p.ContentType()
-	for _, p := range ps {
+	md["Micro-Topic"] = p.Topic()
-		md := metadata.Copy(omd)
-		md[metadata.HeaderContentType] = p.ContentType()
 
 	// passed in raw data
 	if d, ok := p.Payload().(*codec.Frame); ok {
@@ -760,21 +660,16 @@ func (g *grpcClient) publish(ctx context.Context, ps []client.Message, opts ...c
 	}
 
 	topic := p.Topic()
-		if len(exchange) > 0 {
+
-			topic = exchange
+	// get the exchange
+	if len(options.Exchange) > 0 {
+		topic = options.Exchange
 	}
 
-		for k, v := range p.Metadata() {
+	return g.opts.Broker.Publish(metadata.NewOutgoingContext(ctx, md), topic, &broker.Message{
-			md.Set(k, v)
+		Header: md,
-		}
+		Body:   body,
-		md.Set(metadata.HeaderTopic, topic)
+	}, broker.PublishContext(options.Context))
-		msgs = append(msgs, &broker.Message{Header: md, Body: body})
-	}
-
-	return g.opts.Broker.BatchPublish(ctx, msgs,
-		broker.PublishContext(options.Context),
-		broker.PublishBodyOnly(options.BodyOnly),
-	)
 }
 
 func (g *grpcClient) String() string {
@@ -785,45 +680,41 @@ func (g *grpcClient) Name() string {
 	return g.opts.Name
 }
 
-func (g *grpcClient) getGrpcDialOptions(ctx context.Context) []grpc.DialOption {
+func (g *grpcClient) getGrpcDialOptions() []grpc.DialOption {
-	var opts []grpc.DialOption
+	if g.opts.CallOptions.Context == nil {
-
+		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...)
-			}
-		}
 	}
 
-	if ctx != nil {
+	v := g.opts.CallOptions.Context.Value(grpcDialOptions{})
-		if v := ctx.Value(grpcDialOptions{}); v != nil {
+
-			if vopts, ok := v.([]grpc.DialOption); ok {
+	if v == nil {
-				opts = append(opts, vopts...)
+		return nil
-			}
 	}
+
+	opts, ok := v.([]grpc.DialOption)
+
+	if !ok {
+		return nil
 	}
 
 	return opts
 }
 
-func (g *grpcClient) getGrpcCallOptions(ctx context.Context) []grpc.CallOption {
+func (g *grpcClient) getGrpcCallOptions() []grpc.CallOption {
-	var opts []grpc.CallOption
+	if g.opts.CallOptions.Context == nil {
-
+		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...)
-			}
-		}
 	}
 
-	if ctx != nil {
+	v := g.opts.CallOptions.Context.Value(grpcCallOptions{})
-		if v := ctx.Value(grpcCallOptions{}); v != nil {
+
-			if vopts, ok := v.([]grpc.CallOption); ok {
+	if v == nil {
-				opts = append(opts, vopts...)
+		return nil
-			}
 	}
+
+	opts, ok := v.([]grpc.CallOption)
+
+	if !ok {
+		return nil
 	}
 
 	return opts
@@ -832,15 +723,14 @@ func (g *grpcClient) getGrpcCallOptions(ctx context.Context) []grpc.CallOption {
 func NewClient(opts ...client.Option) client.Client {
 	options := client.NewOptions(opts...)
 	// default content type for grpc
-	if options.ContentType == "" {
+	options.ContentType = "application/grpc+proto"
-		options.ContentType = DefaultContentType
-	}
 
 	rc := &grpcClient{
 		opts: options,
 	}
 
-	rc.pool = NewConnPool(options.PoolSize, options.PoolTTL, rc.poolMaxIdle(), rc.poolMaxStreams())
+	rc.pool = newPool(options.PoolSize, options.PoolTTL, rc.poolMaxIdle(), rc.poolMaxStreams())
+
 	c := client.Client(rc)
 
 	// wrap in reverse

grpc_pool.go

@@ -2,7 +2,6 @@ package grpc
 
 import (
 	"context"
-	"strings"
 	"sync"
 	"time"
 
@@ -10,7 +9,7 @@ import (
 	"google.golang.org/grpc/connectivity"
 )
 
-type ConnPool struct {
+type pool struct {
 	conns      map[string]*streamsPool
 	size       int
 	ttl        int64
@@ -21,36 +20,36 @@ type ConnPool struct {
 
 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 {
 	err error
 	*grpc.ClientConn
-	next    *PoolConn
+	next    *poolConn
-	pool    *ConnPool
+	pool    *pool
 	sp      *streamsPool
-	pre     *PoolConn
+	pre     *poolConn
 	addr    string
 	streams int
 	created int64
 	in      bool
 }
 
-func NewConnPool(size int, ttl time.Duration, idle int, ms int) *ConnPool {
+func newPool(size int, ttl time.Duration, idle int, ms int) *pool {
 	if ms <= 0 {
 		ms = 1
 	}
 	if idle < 0 {
 		idle = 0
 	}
-	return &ConnPool{
+	return &pool{
 		size:       size,
 		ttl:        int64(ttl.Seconds()),
 		maxStreams: ms,
@@ -59,15 +58,12 @@ func NewConnPool(size int, ttl time.Duration, idle int, ms int) *ConnPool {
 	}
 }
 
-func (p *ConnPool) Get(ctx context.Context, addr string, opts ...grpc.DialOption) (*PoolConn, error) {
+func (p *pool) getConn(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
@@ -130,12 +126,12 @@ func (p *ConnPool) Get(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{ClientConn: cc, err: nil, addr: addr, pool: p, sp: sp, streams: 1, created: time.Now().Unix(), pre: nil, next: nil, in: 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()
@@ -147,7 +143,7 @@ func (p *ConnPool) Get(ctx context.Context, addr string, opts ...grpc.DialOption
 	return conn, nil
 }
 
-func (p *ConnPool) Put(conn *PoolConn, err error) {
+func (p *pool) release(conn *poolConn, err error) {
 	p.Lock()
 	p, sp, created := conn.pool, conn.sp, conn.created
 	//  try to add conn
@@ -182,11 +178,11 @@ func (p *ConnPool) Put(conn *PoolConn, err error) {
 	p.Unlock()
 }
 
-func (conn *PoolConn) Close() {
+func (conn *poolConn) Close() {
-	conn.pool.Put(conn, conn.err)
+	conn.pool.release(conn, conn.err)
 }
 
-func removeConn(conn *PoolConn) {
+func removeConn(conn *poolConn) {
 	if conn.pre != nil {
 		conn.pre.next = conn.next
 	}
@@ -199,7 +195,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,19 +1,20 @@
 package grpc
 
 import (
-	"go.unistack.org/micro/v3/client"
+	"github.com/unistack-org/micro/v3/client"
-	"go.unistack.org/micro/v3/metadata"
 )
 
 type grpcEvent struct {
 	payload     interface{}
 	topic       string
 	contentType string
-	opts        client.MessageOptions
 }
 
 func newGRPCEvent(topic string, payload interface{}, contentType string, opts ...client.MessageOption) client.Message {
-	options := client.NewMessageOptions(opts...)
+	var options client.MessageOptions
+	for _, o := range opts {
+		o(&options)
+	}
 
 	if len(options.ContentType) > 0 {
 		contentType = options.ContentType
@@ -23,7 +24,6 @@ func newGRPCEvent(topic string, payload interface{}, contentType string, opts ..
 		payload:     payload,
 		topic:       topic,
 		contentType: contentType,
-		opts:        options,
 	}
 }
 
@@ -38,7 +38,3 @@ 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

@@ -4,13 +4,13 @@ package grpc
 import (
 	"context"
 
-	"go.unistack.org/micro/v3/client"
+	"github.com/unistack-org/micro/v3/client"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )
 
 var (
-	// DefaultPoolMaxStreams maximum streams on a connection
+	// DefaultPoolMaxStreams maximum streams on a connectioin
 	// (20)
 	DefaultPoolMaxStreams = 20
 
@@ -25,9 +25,6 @@ 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{}
@@ -73,7 +70,9 @@ func Codec(contentType string, c encoding.Codec) client.Option {
 
 type maxRecvMsgSizeKey struct{}
 
+//
 // 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 {
@@ -85,7 +84,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 {
@@ -97,7 +98,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 {
@@ -109,7 +112,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 {
@@ -118,14 +123,3 @@ 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,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"go.unistack.org/micro/v3/client"
+	"github.com/unistack-org/micro/v3/client"
-	"go.unistack.org/micro/v3/codec"
+	"github.com/unistack-org/micro/v3/codec"
 )
 
 type grpcRequest struct {
@@ -38,12 +38,15 @@ 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, opts ...client.RequestOption) client.Request {
+func newGRPCRequest(service, method string, request interface{}, contentType string, reqOpts ...client.RequestOption) client.Request {
-	options := client.NewRequestOptions(opts...)
+	var opts client.RequestOptions
+	for _, o := range reqOpts {
+		o(&opts)
+	}
 
 	// set the content-type specified
-	if len(options.ContentType) > 0 {
+	if len(opts.ContentType) > 0 {
-		contentType = options.ContentType
+		contentType = opts.ContentType
 	}
 
 	return &grpcRequest{
@@ -51,7 +54,7 @@ func newGRPCRequest(service, method string, request interface{}, contentType str
 		method:      method,
 		request:     request,
 		contentType: contentType,
-		opts:        options,
+		opts:        opts,
 	}
 }
 

response.go

@@ -3,13 +3,13 @@ package grpc
 import (
 	"strings"
 
-	"go.unistack.org/micro/v3/codec"
+	"github.com/unistack-org/micro/v3/codec"
-	"go.unistack.org/micro/v3/metadata"
+	"github.com/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 nil
+		return metadata.New(0)
 	}
 	md := metadata.New(len(meta))
 	for k, v := range meta {

stream.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"sync"
 
-	"go.unistack.org/micro/v3/client"
+	"github.com/unistack-org/micro/v3/client"
 	"google.golang.org/grpc"
 )
 
@@ -17,7 +17,7 @@ type grpcStream struct {
 	request  client.Request
 	response client.Response
 	close    func(err error)
-	conn     *PoolConn
+	conn     *poolConn
 	sync.RWMutex
 	closed bool
 }
@@ -42,14 +42,6 @@ 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)
 
@@ -68,24 +60,6 @@ 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()
@@ -116,17 +90,3 @@ 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()
-}