rebuild .proto and pass test

Author: tsingson

README.md

@@ -93,6 +93,21 @@ goim 是 非常成功的 IM 原型( 即时消息平台), 依赖项为 kafka ( 
 
 
 
+**proto 生成go**
+```
+cd ./api/comet/grpc
+
+protoc  -I=/Users/qinshen/go/src -I=/usr/local/include  -I=./ --gofast_out=plugins=grpc:.  ./*.proto
+
+cd ./api/logic/grpc
+
+protoc  -I=/Users/qinshen/go/src -I=/usr/local/include  -I=./ --gofast_out=plugins=grpc:.  ./*.proto
+
+
+```
+
+
+
 请查看 [/Makefile](/Makefile) , 运行 make 
 
 **编译**

api/comet/grpc/api.pb.go

@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package goim.comet;
 option go_package = "grpc";
+option (gogoproto.testgen_all) = true;
+option (gogoproto.benchgen_all) = true;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 

api/comet/grpc/api.proto

@@ -0,0 +1,3 @@
+
+protoc  -I=/Users/qinshen/go/src -I=/usr/local/include  -I=./ --gofast_out=plugins=grpc:.  ./*.proto
+

api/comet/grpc/apipb_test.go

@@ -3,6 +3,8 @@ syntax = "proto3";
 package goim.logic;
 
 option go_package = "grpc";
+option (gogoproto.testgen_all) = true;
+option (gogoproto.benchgen_all) = true;
 
 import "github.com/tsingson/ex-goim/api/comet/grpc/api.proto";
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";

api/comet/grpc/build.sh

@@ -30,7 +30,6 @@ require (
 	github.com/nsip/gommap v0.0.0-20181229045655-f7881c3a959f // indirect
 	github.com/pascaldekloe/goe v0.1.0 // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/sanity-io/litter v1.1.0
 	github.com/sirupsen/logrus v1.4.1 // indirect
 	github.com/spf13/afero v1.2.2
 	github.com/stretchr/testify v1.3.0

api/logic/grpc/api.pb.go

@@ -0,0 +1,49 @@
+package comet
+
+import (
+	"context"
+	"time"
+
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/balancer/roundrobin"
+	"google.golang.org/grpc/keepalive"
+
+	logic "github.com/tsingson/ex-goim/api/logic/grpc"
+	"github.com/tsingson/ex-goim/goim-nats/comet/conf"
+)
+
+const (
+	// grpc options
+	grpcInitialWindowSize     = 1 << 24
+	grpcInitialConnWindowSize = 1 << 24
+	grpcMaxSendMsgSize        = 1 << 24
+	grpcMaxCallMsgSize        = 1 << 24
+	grpcKeepAliveTime         = time.Second * 10
+	grpcKeepAliveTimeout      = time.Second * 3
+	grpcBackoffMaxDelay       = time.Second * 3
+)
+
+// NewLogicClient  grpc client for logic
+func NewLogicClient(c *conf.RPCClient) logic.LogicClient {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(c.Dial))
+	defer cancel()
+	conn, err := grpc.DialContext(ctx, "discovery://default/goim.logic",
+		[]grpc.DialOption{
+			grpc.WithInsecure(),
+			grpc.WithInitialWindowSize(grpcInitialWindowSize),
+			grpc.WithInitialConnWindowSize(grpcInitialConnWindowSize),
+			grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(grpcMaxCallMsgSize)),
+			grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(grpcMaxSendMsgSize)),
+			grpc.WithBackoffMaxDelay(grpcBackoffMaxDelay),
+			grpc.WithKeepaliveParams(keepalive.ClientParameters{
+				Time:                grpcKeepAliveTime,
+				Timeout:             grpcKeepAliveTimeout,
+				PermitWithoutStream: true,
+			}),
+			grpc.WithBalancerName(roundrobin.Name),
+		}...)
+	if err != nil {
+		panic(err)
+	}
+	return logic.NewLogicClient(conn)
+}

api/logic/grpc/api.proto

@@ -9,7 +9,7 @@ import (
 	"github.com/zhenjl/cityhash"
 
 	logic "github.com/tsingson/ex-goim/api/logic/grpc"
-	"github.com/tsingson/ex-goim/goim-nats/comet/client"
+
 	"github.com/tsingson/ex-goim/goim-nats/comet/conf"
 )
 
@@ -34,7 +34,7 @@ func NewServer(cfg *conf.CometConfig) *Server {
 	s := &Server{
 		c:         cfg,
 		round:     NewRound(cfg),
-		rpcClient: client.NewLogicClient(cfg.RPCClient),
+		rpcClient: NewLogicClient(cfg.RPCClient),
 	}
 	// init bucket
 	s.buckets = make([]*Bucket, cfg.Bucket.Size)