Merge pull request #138 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.22

Bump go.unistack.org/micro/v3 from 3.10.20 to 3.10.22

.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

@@ -9,7 +9,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: "codeql"
 
 on:
   workflow_run:
@@ -17,16 +17,16 @@ on:
     types:
       - completed
   push:
-    branches: [ master ]
+    branches: [ master, v3 ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master, v3 ]
   schedule:
     - cron: '34 1 * * 0'
 
 jobs:
   analyze:
-    name: Analyze
+    name: analyze
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -42,12 +42,15 @@ jobs:
         # 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 repository
+    - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
-
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
     # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
+    - name: init
-      uses: github/codeql-action/init@v1
+      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.
@@ -57,8 +60,8 @@ jobs:
 
     # 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
+    - name: autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -71,5 +74,5 @@ jobs:
     #   make bootstrap
     #   make release
 
-    - name: Perform CodeQL Analysis
+    - name: analyze
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -1,66 +1,27 @@
-name: "prautomerge"
+name: "dependabot-automerge"
 
 on:
-  workflow_run:
+  pull_request_target:
-    workflows: ["prbuild"]
+    types: [assigned, opened, synchronize, reopened]
-    types:
-      - completed
 
 permissions:
-  contents: write
   pull-requests: write
+  contents: write
 
 jobs:
-  Dependabot-Automerge:
+  automerge:
     runs-on: ubuntu-latest
-    # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR
+    if: github.actor == 'dependabot[bot]'
-    # The the github.event.workflow_run.event value is 'push' and not 'pull_request'
-    # dont work with multiple workflows when last returns success
-    if: >-
-      github.event.workflow_run.conclusion == 'success'
-      && github.actor == 'dependabot[bot]'
-      && github.event.sender.login == 'dependabot[bot]'
-      && github.event.sender.type == 'Bot'
-      && (github.event.workflow_run.event == 'pull_request'
-          || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
     steps:
-      - name: Approve Changes and Merge changes if label 'dependencies' is set
+      - name: metadata
-        uses: actions/github-script@v5
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.6
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: "${{ secrets.TOKEN }}"
-          script: |
+      - name: merge
-            console.log(context.payload.workflow_run);
+        id: merge
-            
+        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
-            var labelNames = await github.paginate(
+        run: gh pr merge --auto --merge "$PR_URL"
-              github.issues.listLabelsOnIssue,
+        env:
-              {
+          PR_URL: ${{github.event.pull_request.html_url}}
-                repo: context.repo.repo,
+          GITHUB_TOKEN: ${{secrets.TOKEN}}
-                owner: context.repo.owner,
-                issue_number: context.payload.workflow_run.pull_requests[0].number,
-              },
-              (response) => response.data.map(
-                (label) => label.name
-              )
-            );
-
-            console.log(labelNames);
-
-            if (labelNames.includes('dependencies')) {
-              console.log('Found label');
-
-              await github.pulls.createReview({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-                event: 'APPROVE'
-              });
-              console.log('Approved PR');
-
-              await github.pulls.merge({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-              });
-
-              console.log('Merged PR');
-            }

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

codec.go

@@ -3,7 +3,7 @@ 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"
 )

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,36 +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.Error{
+	return err
-		ID:     "go.micro.client",
-		Code:   int32(s.Code()),
-		Detail: s.Message(),
-		Status: s.Code().String(),
-	}
 }

go.mod

@@ -1,10 +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/unistack-org/micro/v3 v3.7.8
+	go.unistack.org/micro/v3 v3.10.22
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
+	google.golang.org/grpc v1.52.3
-	google.golang.org/genproto v0.0.0-20210729151513-df9385d47c1b // indirect
-	google.golang.org/grpc v1.40.0
 )

grpc.go

@@ -1,5 +1,5 @@
 // Package grpc provides a gRPC client
-package grpc
+package grpc // import "go.unistack.org/micro-client-grpc/v3"
 
 import (
 	"context"
@@ -12,19 +12,21 @@ import (
 	"sync"
 	"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+proto"
+	DefaultContentType = "application/grpc"
 )
 
 type grpcClient struct {
@@ -62,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 {
@@ -76,9 +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)
+	header["timeout"] = fmt.Sprintf("%dn", opts.RequestTimeout)
+	header["content-type"] = req.ContentType()
 
 	md := gmetadata.New(header)
 	ctx = gmetadata.NewOutgoingContext(ctx, md)
@@ -110,10 +118,18 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 		),
 	}
 
-	if opts := g.getGrpcDialOptions(); opts != nil {
+	if opts := g.getGrpcDialOptions(opts.Context); opts != nil {
 		grpcDialOptions = append(grpcDialOptions, opts...)
 	}
 
+	contextDialer := g.opts.ContextDialer
+	if opts.ContextDialer != nil {
+		contextDialer = opts.ContextDialer
+	}
+	if contextDialer != nil {
+		grpcDialOptions = append(grpcDialOptions, grpc.WithContextDialer(contextDialer))
+	}
+
 	cc, err := g.pool.getConn(dialCtx, addr, grpcDialOptions...)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error sending request: %v", err))
@@ -124,15 +140,22 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 	}()
 
 	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)
 	}()
@@ -144,6 +167,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
 }
 
@@ -161,10 +191,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)
@@ -196,10 +227,18 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 		),
 	}
 
-	if opts := g.getGrpcDialOptions(); opts != nil {
+	if opts := g.getGrpcDialOptions(opts.Context); opts != nil {
 		grpcDialOptions = append(grpcDialOptions, opts...)
 	}
 
+	contextDialer := g.opts.ContextDialer
+	if opts.ContextDialer != nil {
+		contextDialer = opts.ContextDialer
+	}
+	if contextDialer != nil {
+		grpcDialOptions = append(grpcDialOptions, grpc.WithContextDialer(contextDialer))
+	}
+
 	cc, err := g.pool.getConn(dialCtx, addr, grpcDialOptions...)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error sending request: %v", err))
@@ -212,12 +251,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)
@@ -263,6 +307,7 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 	// set the stream as the response
 	val := reflect.ValueOf(rsp).Elem()
 	val.Set(reflect.ValueOf(stream).Elem())
+
 	return nil
 }
 
@@ -387,6 +432,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)
 	}
@@ -435,20 +481,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)
@@ -461,6 +495,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()
 
@@ -552,18 +603,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
@@ -577,6 +617,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()
 
@@ -669,7 +726,6 @@ func (g *grpcClient) publish(ctx context.Context, ps []client.Message, opts ...c
 	for _, p := range ps {
 		md := metadata.Copy(omd)
 		md[metadata.HeaderContentType] = p.ContentType()
-		md[metadata.HeaderTopic] = p.Topic()
 
 		// passed in raw data
 		if d, ok := p.Payload().(*codec.Frame); ok {
@@ -693,6 +749,9 @@ func (g *grpcClient) publish(ctx context.Context, ps []client.Message, opts ...c
 			topic = exchange
 		}
 
+		for k, v := range p.Metadata() {
+			md.Set(k, v)
+		}
 		md.Set(metadata.HeaderTopic, topic)
 		msgs = append(msgs, &broker.Message{Header: md, Body: body})
 	}
@@ -711,41 +770,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
@@ -754,7 +817,9 @@ func (g *grpcClient) getGrpcCallOptions() []grpc.CallOption {
 func NewClient(opts ...client.Option) client.Client {
 	options := client.NewOptions(opts...)
 	// default content type for grpc
-	options.ContentType = defaultContentType
+	if options.ContentType == "" {
+		options.ContentType = DefaultContentType
+	}
 
 	rc := &grpcClient{
 		opts: options,

grpc_pool.go

@@ -2,6 +2,7 @@ package grpc
 
 import (
 	"context"
+	"strings"
 	"sync"
 	"time"
 
@@ -59,6 +60,9 @@ 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) {
+	if strings.HasPrefix(addr, "http") {
+		addr = addr[strings.Index(addr, ":")+3:]
+	}
 	now := time.Now().Unix()
 	p.Lock()
 	sp, ok := p.conns[addr]
@@ -126,7 +130,7 @@ 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

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

@@ -4,7 +4,7 @@ package grpc
 import (
 	"context"
 
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v3/client"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )
@@ -70,9 +70,7 @@ 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 {
@@ -84,9 +82,7 @@ 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 {
@@ -98,9 +94,7 @@ 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 {
@@ -112,9 +106,7 @@ 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 {

request.go

@@ -4,8 +4,8 @@ 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 {
@@ -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,8 +3,8 @@ 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"
 )
 
@@ -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,7 +5,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v3/client"
 	"google.golang.org/grpc"
 )
 
@@ -42,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)
 
@@ -60,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()
@@ -90,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()
+}