perf: v3版本(加上case校验)

Author: Yziyan

go.mod

@@ -2,17 +2,11 @@ module github.com/Go-To-Byte/grpc-goroutine
 
 go 1.19
 
-require (
-github.com/stretchr/testify v1.8.2
-go.uber.org/zap v1.24.0
-)
+require go.uber.org/zap v1.24.0
 
 require (
-github.com/davecgh/go-spew v1.1.1 // indirect
 github.com/pkg/errors v0.9.1 // indirect
-github.com/pmezard/go-difflib v1.0.0 // indirect
+github.com/stretchr/testify v1.8.2 // indirect
 go.uber.org/atomic v1.10.0 // indirect
 go.uber.org/multierr v1.9.0 // indirect
-gopkg.in/yaml.v2 v2.4.0 // indirect
-gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,74 +1,26 @@
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
 go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
-go.uber.org/zap v1.20.0 h1:N4oPlghZwYG55MlU6LXk/Zp00FVNE9X9wrYO8CEs4lc=
-go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

grpcrun/grpcrun_test.go

@@ -4,7 +4,7 @@ package grpcrun_test
 import (
 "context"
 "fmt"
-"github.com/stretchr/testify/assert"
+"go.uber.org/zap"
 "testing"
 "time"
 
@@ -25,23 +25,99 @@ type loginResp struct {
 
 // GRPC请求的方法参数
 func Login(ctx context.Context, req *loginReq) (*loginResp, error) {
+if req.Username != "ciusyan" || req.Password != "222" {
+return nil, fmt.Errorf("登录失败")
+}
+fmt.Println("登录成功")
+return &loginResp{UserId: 21, Token: "test grpc call success"}, nil
+}
+
+// 参数数量不正常、返回值正常
+func Login1() (*loginResp, error) {
+fmt.Println("登录成功")
+return &loginResp{UserId: 21, Token: "test grpc call success"}, nil
+}
+
+// 第一个参数 不是 context 类型
+func Login2(ctx int, req *loginReq) (*loginResp, error) {
+
 if req.Username != "ciusyan" && req.Password != "222" {
 return nil, fmt.Errorf("登录失败")
 }
 fmt.Println("登录成功")
 return &loginResp{UserId: 21, Token: "test grpc call success"}, nil
 }
 
+// 参数正常，返回值数量不正常
+func Login3(ctx context.Context, req *loginReq) {
+if req.Username != "ciusyan" && req.Password != "222" {
+return
+}
+fmt.Println("登录成功")
+}
+
+// 参数正常，第二个返回值不是 error
+func Login4(ctx context.Context, req *loginReq) (*loginResp, int) {
+if req.Username != "ciusyan" && req.Password != "222" {
+return nil, 0
+}
+fmt.Println("登录成功")
+return &loginResp{UserId: 21, Token: "test grpc call success"}, 1
+}
+
+var (
+datas []*data
+)
+
 func TestGrpcTask(t *testing.T) {
 
-should := assert.New(t)
+for i, d := range datas {
+call := grpcrun.NewGrpc(&d.ctx, d.method, d.req)
+call.GrpcTask()
+
+t.Logf("第 %d 次执行\n", i+1)
+if call.Err != nil {
+fmt.Println(call.Err)
+fmt.Println()
+continue
+}
+//if should.NoError(call.Err) {
+//	fmt.Println(call.Response.(*loginResp))
+//}
+fmt.Println(call.Response.(*loginResp))
+fmt.Println()
+
+}
+}
+
+type data struct {
+ctx context.Context
+method any
+req any
+}
+
+func newData(ctx context.Context, method any, req any) *data {
+return &data{ctx: ctx, method: method, req: req}
+}
+
+func init() {
 req := &loginReq{Username: "ciusyan", Password: "222"}
 ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
 defer cancel()
-task := grpcrun.NewGrpc(&ctx, Login, req)
-task.GrpcTask()
 
-if should.NoError(task.Err) {
-t.Log(task.Response.(*loginResp))
+// 测试表格
+datas = []*data{
+newData(ctx, Login, req), // 正常
+newData(ctx, Login1, req), // [grpcMethod]必须有2个参数(context.Context, *request)
+newData(ctx, Login2, req), // [grpcMethod]的第1个参数必须是：context.Context
+newData(ctx, Login3, req), // [grpcMethod]必须有2个返回值(*Response, error)
+newData(ctx, Login4, req), // [grpcMethod]的第2个返回值必须是：error
+newData(nil, Login, req), // 请正确的传递[Context]，不支持：nil
+newData(ctx, nil, req), // [grpcMethod]必须是一个GRPC的函数类型，现在是：invalid
+newData(ctx, Login, nil), // 请正确的传递[request]，不支持：invalid
+newData(ctx, "其他类型", req), // [grpcMethod]必须是一个GRPC的函数类型，现在是：string
+newData(ctx, Login, "其他类型"), // 请正确的传入[request]，不支持：string
+newData(ctx, Login, zap.S()), // [request]的参数与[grpcMethod]的参数不匹配：grpcMethod = v3_test.loginReq, request = zap.SugaredLogger
+
 }
 }

grpcrun/task.go

@@ -37,20 +37,85 @@ func NewGrpc(ctx *context.Context, grpcMethod any, req any) *Grpc {
 
 // GrpcTask ：去调用GRPC的方法
 func (c *Grpc) GrpcTask() {
-v := reflect.ValueOf(c.grpcMethod)
-if v.Kind() != reflect.Func {
-c.Err = fmt.Errorf("[grpcMethod]必须是一个GRPC的函数类型")
+// 进行参数校验
+c.validate()
+if c.Err != nil {
 return
 }
 
-// 进行方法调用
+// 能来到这里，参数一定正确了，进行方法调用
+// 形如：Login(ctx context.Context, req *loginReq) (*loginResp, error)
+c.call()
+}
+
+func (c *Grpc) call() {
+v := reflect.ValueOf(c.grpcMethod)
+
+// 调用参数
 argv := make([]reflect.Value, 2)
 argv[0] = reflect.ValueOf(*c.ctx)
 argv[1] = reflect.ValueOf(c.request)
+
+// 反射调用
 res := v.Call(argv)
 
+// 给返回值 赋值
 c.Response = res[0].Interface()
 if res[1].Interface() != nil {
 c.Err = res[1].Interface().(error)
 }
 }
+
+// 校验结构体
+func (c *Grpc) validate() {
+
+// 校验 req 类型
+reqV := reflect.ValueOf(c.request)
+if !reqV.IsValid() || reqV.Kind() != reflect.Ptr {
+c.Err = fmt.Errorf("请正确的传递[request]，不支持：%v", reqV.Kind())
+return
+}
+
+// 校验 ctx 类型
+ctxV := reflect.ValueOf(c.ctx).Elem()
+if ctxV.IsNil() {
+c.Err = fmt.Errorf("请正确的传递[Context]，不支持：nil")
+return
+}
+
+// 校验 grpcMethod 的信息
+methodV := reflect.ValueOf(c.grpcMethod)
+if methodV.Kind() != reflect.Func {
+c.Err = fmt.Errorf("[grpcMethod]必须是一个GRPC的函数类型，现在是：%v", methodV.Kind())
+return
+}
+
+// 简单校验参数类型
+methodT := methodV.Type()
+if methodT.NumIn() != 2 {
+c.Err = fmt.Errorf("[grpcMethod]必须有2个参数(context.Context, *request)")
+return
+}
+
+// 校验 grpcMethod 的第一个参数
+if methodT.In(0).Kind() != reflect.Interface || methodT.In(0).Name() != "Context" {
+c.Err = fmt.Errorf("[grpcMethod]的第1个参数必须是：context.Context")
+return
+}
+
+if reqV.Type().Elem() != methodT.In(1).Elem() {
+c.Err = fmt.Errorf("[request]的参数与[grpcMethod]的参数不匹配：grpcMethod = %v, request = %v",
+methodT.In(1).Elem(), reqV.Type().Elem())
+return
+}
+
+if methodT.NumOut() != 2 {
+c.Err = fmt.Errorf("[grpcMethod]必须有2个返回值(*Response, error)")
+return
+}
+
+if methodT.Out(1).Kind() != reflect.Interface || methodT.Out(1).Name() != "error" {
+c.Err = fmt.Errorf("[grpcMethod]的第2个返回值必须是：error")
+return
+}
+}