improve grpcx

cmd/gf/internal/cmd/genpb/genpb.go

@@ -12,7 +12,7 @@ import (
 type (
  CGenPb struct{}
  CGenPbInput struct {
- g.Meta `name:"pb" brief:"parse proto files and generate protobuf go files"`
+ g.Meta `name:"pb" config:"gfcli.gen.pb" brief:"parse proto files and generate protobuf go files"`
  Path string `name:"path" short:"p" dc:"protobuf file folder path" d:"manifest/protobuf"`
  OutputApi string `name:"outputApi" short:"oa" dc:"output folder path storing generated go files of api" d:"api"`
  OutputCtrl string `name:"outputCtrl" short:"oc" dc:"output folder path storing generated go files of controller" d:"internal/controller"`

contrib/rpc/grpcx/grpcx_registry_file.go

@@ -30,5 +30,5 @@ func autoLoadAndRegisterFileRegistry() {
  )
 
  g.Log().Debug(ctx, `set default registry using file registry as no custom registry set`)
- resolver.SetRegistry(fileRegistry)
+ resolver.Registry(fileRegistry)
 }

contrib/rpc/grpcx/internal/resolver/resolver.go

@@ -25,8 +25,8 @@ func init() {
  resolver.Register(NewBuilder(gsvc.GetRegistry()))
 }
 
-// SetRegistry sets the default Registry implements as your own implemented interface.
-func SetRegistry(registry gsvc.Registry) {
+// Registry sets the default Registry implements as your own implemented interface.
+func Registry(registry gsvc.Registry) {
  if registry == nil {
  panic(gerror.New(`invalid Registry value "nil" given`))
  }

contrib/rpc/grpcx/internal/resolver/resolver_manager.go

@@ -15,6 +15,12 @@ import (
 // Manager for Builder creating.
 type Manager struct{}
 
+// New creates and returns a Builder.
 func (m Manager) New(discovery gsvc.Discovery) resolver.Builder {
  return NewBuilder(discovery)
 }
+
+// Registry sets the default Registry implements as your own implemented interface.
+func (m Manager) Registry(registry gsvc.Registry) {
+ Registry(registry)
+}

example/registry/file/client/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
- "fmt"
  "time"
 
  "github.com/gogf/gf/contrib/registry/file/v2"
@@ -15,12 +14,13 @@ func main() {
  gsvc.SetRegistry(file.New(gfile.Temp("gsvc")))
 
  client := g.Client()
- for i := 0; i < 100; i++ {
- res, err := client.Get(gctx.New(), `http://hello.svc/`)
+ for i := 0; i < 10; i++ {
+ ctx := gctx.New()
+ res, err := client.Get(ctx, `http://hello.svc/`)
  if err != nil {
  panic(err)
  }
- fmt.Println(res.ReadAllString())
+ g.Log().Debug(ctx, res.ReadAllString())
  res.Close()
  time.Sleep(time.Second)
  }

example/rpc/grpcx/basic/client/main.go

@@ -10,23 +10,21 @@ import (
  "time"
 
  "github.com/gogf/gf/contrib/rpc/grpcx/v2"
- "github.com/gogf/gf/example/rpc/grpcx/basic/protocol"
+ "github.com/gogf/gf/example/rpc/grpcx/basic/protobuf"
  "github.com/gogf/gf/v2/frame/g"
  "github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {
- var (
- ctx = gctx.GetInitCtx()
- client = protocol.NewEchoClient(grpcx.Client.MustNewGrpcClientConn("demo"))
- )
- for i := 0; i < 100; i++ {
- res, err := client.Say(ctx, &protocol.SayReq{Content: "Hello"})
+ var client = protobuf.NewGreeterClient(grpcx.Client.MustNewGrpcClientConn("demo"))
+ for i := 0; i < 10; i++ {
+ ctx := gctx.New()
+ res, err := client.SayHello(ctx, &protobuf.HelloRequest{Name: "gfer"})
  if err != nil {
  g.Log().Error(ctx, err)
  return
  }
- g.Log().Print(ctx, "Response:", res.Content)
+ g.Log().Debug(ctx, "Response:", res.Message)
  time.Sleep(time.Second)
  }
 }

example/rpc/grpcx/basic/controller/helloworld.go

@@ -0,0 +1,27 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https:/gogf/gf.
+
+package controller
+
+import (
+ "context"
+
+ "github.com/gogf/gf/contrib/rpc/grpcx/v2"
+ "github.com/gogf/gf/example/rpc/grpcx/basic/protobuf"
+)
+
+type Controller struct {
+ protobuf.UnimplementedGreeterServer
+}
+
+func Register(s *grpcx.GrpcServer) {
+ protobuf.RegisterGreeterServer(s.Server, &Controller{})
+}
+
+// SayHello implements helloworld.GreeterServer
+func (s *Controller) SayHello(ctx context.Context, in *protobuf.HelloRequest) (*protobuf.HelloReply, error) {
+ return &protobuf.HelloReply{Message: "Hello " + in.GetName()}, nil
+}

example/rpc/grpcx/basic/protobuf/helloworld.proto

@@ -0,0 +1,24 @@
+// protoc --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. *.proto
+
+syntax = "proto3";
+
+package protobuf;
+
+option go_package = "github.com/gogf/gf/grpc/example/helloworld/protobuf";
+
+
+// The greeting service definition.
+service Greeter {
+ // Sends a greeting
+ rpc SayHello (HelloRequest) returns (HelloReply) {}
+}
+
+// The request message containing the user's name.
+message HelloRequest {
+ string name = 1;
+}
+
+// The response message containing the greetings
+message HelloReply {
+ string message = 1;
+}