support gRPC reflection with gRPC Web (#84)

Makefile

@@ -38,7 +38,7 @@ deadcode-test:
 
 .PHONY: vet
 vet:
-	@gometalinter --vendor --disable-all --enable=vet ./...
+	@gometalinter --vendor --disable-all $(shell go list ./... | grep -v tests)
 
 .PHONY: deadcode
 deadcode:

adapter/controller/cli.go

@@ -322,10 +322,11 @@ func (c *CLI) runAsCLI() int {
 			errCh <- err
 			return
 		}
-		interactor := usecase.NewInteractor(p)
 		closeCtx, closeCancel := context.WithTimeout(context.Background(), 10*time.Second)
 		defer closeCancel()
-		defer interactor.Close(closeCtx)
+		defer p.Cleanup(closeCtx)
+
+		interactor := usecase.NewInteractor(p)
 
 		res, err := interactor.Call(&port.CallParams{RPCName: c.wcfg.call})
 		if err != nil {
@@ -398,10 +399,11 @@ func (c *CLI) runAsREPL() int {
 			errCh <- err
 			return
 		}
-		interactor := usecase.NewInteractor(p)
 		closeCtx, closeCancel := context.WithTimeout(context.Background(), 10*time.Second)
 		defer closeCancel()
-		defer interactor.Close(closeCtx)
+		defer p.Cleanup(closeCtx)
+
+		interactor := usecase.NewInteractor(p)
 
 		var ui UI
 		if c.wcfg.cfg.REPL.ColoredOutput {

adapter/gateway/grpc_reflection.go

@@ -7,6 +7,8 @@ import (
 	"github.com/jhump/protoreflect/grpcreflect"
 	"github.com/ktr0731/evans/adapter/protobuf"
 	"github.com/ktr0731/evans/entity"
+	"github.com/ktr0731/grpc-web-go-client/grpcweb"
+	"github.com/ktr0731/grpc-web-go-client/grpcweb/grpcweb_reflection_v1alpha"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection/grpc_reflection_v1alpha"
@@ -24,6 +26,12 @@ func newGRPCReflectionClient(conn *grpc.ClientConn) *gRPCReflectoinClient {
 	}
 }
 
+func newGRPCWebReflectionClient(conn *grpcweb.Client) *gRPCReflectoinClient {
+	return &gRPCReflectoinClient{
+		client: grpcreflect.NewClient(context.Background(), grpcweb_reflection_v1alpha.NewServerReflectionClient(conn)),
+	}
+}
+
 func (c *gRPCReflectoinClient) ReflectionEnabled() bool {
 	return c != nil
 }

adapter/gateway/grpcweb.go

@@ -30,7 +30,7 @@ func NewGRPCWebClient(config *config.Config, builder port.DynamicBuilder) *GRPCW
 	}
 
 	if config.Server.Reflection {
-		// TODO: gRPC Web + gRPC reflection
+		client.gRPCReflectoinClient = newGRPCWebReflectionClient(conn)
 	}
 
 	return client
@@ -179,7 +179,10 @@ func (c *GRPCWebClient) NewBidiStream(ctx context.Context, rpc entity.RPC) (enti
 	}
 
 	req := newRequest(c.builder.NewMessage(rpc.RequestMessage()))
-	sc := c.conn.BidiStreaming(ctx, req)
+	sc, err := c.conn.BidiStreaming(ctx, req)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to start bidirectional streaming")
+	}
 
 	return &webBidiStream{
 		conn:       sc,

di/dependency.go

@@ -1,6 +1,7 @@
 package di
 
 import (
+	"context"
 	"io"
 	"sync"
 
@@ -254,5 +255,9 @@ func initDependencies(cfg *config.Config, in io.Reader) error {
 			initDynamicBuilder,
 		)
 	})
-	return initer.init()
+	if err := initer.init(); err != nil {
+		gRPCClient.Close(context.Background())
+		return err
+	}
+	return nil
 }

di/interactor.go

@@ -11,6 +11,7 @@ func NewCLIInteractorParams(cfg *config.Config, in io.Reader) (*usecase.Interact
 	if err := initDependencies(cfg, in); err != nil {
 		return nil, err
 	}
+
 	return &usecase.InteractorParams{
 		Env:            env,
 		OutputPort:     jsonCLIPresenter,

meta/meta.go

@@ -7,5 +7,5 @@ import (
 const AppName = "evans"
 
 var (
-	Version = semver.MustParse("0.5.2")
+	Version = semver.MustParse("0.6.0")
 )

tests/e2e/cli_test.go

@@ -52,9 +52,14 @@ func TestCLI(t *testing.T) {
 			{args: "--reflection", code: 1, useReflection: true},
 			{args: "--reflection --service Greeter", code: 1, useReflection: true},
 			{args: "--reflection --call SayHello", code: 1, useReflection: true},
-			{args: "--reflection --service Greeter --call SayHello", code: 0, useReflection: true},
+			{args: "--reflection --service Greeter --call SayHello", useReflection: true},
 
 			{args: "--web --package helloworld --service Greeter --call SayHello testdata/helloworld.proto", useWeb: true},
+
+			{args: "--web --reflection --package foo", useReflection: true, useWeb: true, code: 1},
+			{args: "--web --reflection --service bar", useReflection: true, useWeb: true, code: 1},
+			{args: "--web --reflection --service Greeter", useReflection: true, useWeb: true, code: 1},
+			{args: "--web --reflection --service Greeter --call SayHello", useReflection: true, useWeb: true},
 		}
 
 		for _, c := range cases {

tests/e2e/repl_test.go

@@ -45,7 +45,8 @@ func TestREPL(t *testing.T) {
 			{args: "--web --package helloworld --service foo testdata/helloworld.proto", useWeb: true, code: 1},
 			{args: "--web --package helloworld --service Greeter testdata/helloworld.proto", useWeb: true},
 
-			{args: "--web --reflection --service Greeter", useReflection: true, useWeb: true, code: 1},
+			{args: "--web --reflection --service Greeter", useReflection: true, useWeb: true},
+			{args: "--web --reflection --service bar", useReflection: true, useWeb: true, code: 1},
 		}
 
 		rh := newREPLHelper([]string{"--silent", "--repl"})

tests/helper/server.go

@@ -34,7 +34,11 @@ func NewServer(t *testing.T, enableReflection bool) *Server {
 
 func (s *Server) Start(web bool) *Server {
 	if web {
-		ws := grpcweb.WrapServer(s.s, grpcweb.WithWebsockets(false))
+		ws := grpcweb.WrapServer(
+			s.s,
+			grpcweb.WithWebsockets(true),
+			grpcweb.WithWebsocketOriginFunc(func(req *http.Request) bool { return true }),
+		)
 		mux := http.NewServeMux()
 		mux.Handle("/", ws)
 		s.ws = &http.Server{

usecase/interactor.go

@@ -26,6 +26,13 @@ type InteractorParams struct {
 	GRPCClient     entity.GRPCClient
 }
 
+func (p *InteractorParams) Cleanup(ctx context.Context) error {
+	if p.GRPCClient != nil {
+		return p.GRPCClient.Close(ctx)
+	}
+	return nil
+}
+
 func NewInteractor(params *InteractorParams) *Interactor {
 	return &Interactor{
 		env:            params.Env,
@@ -59,8 +66,3 @@ func (i *Interactor) Header(params *port.HeaderParams) (io.Reader, error) {
 func (i *Interactor) Call(params *port.CallParams) (io.Reader, error) {
 	return Call(params, i.outputPort, i.inputterPort, i.grpcPort, i.dynamicBuilder, i.env)
 }
-
-// Close closes all dependencies by each Close method.
-func (i *Interactor) Close(ctx context.Context) error {
-	return i.grpcPort.Close(ctx)
-}