update

Author: chenjie199234

grpc/balancer.go cgrpc/balancer.go

@@ -1,4 +1,4 @@
-package grpc
+package cgrpc
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 )
 
 type balancerBuilder struct {
-	c *GrpcClient
+	c *CGrpcClient
 }
 
 func (b *balancerBuilder) Build(cc balancer.ClientConn, opts balancer.BuildOptions) balancer.Balancer {
@@ -32,7 +32,7 @@ func (b *balancerBuilder) Name() string {
 }
 
 type corelibBalancer struct {
-	c        *GrpcClient
+	c        *CGrpcClient
 	cc       balancer.ClientConn
 	servers  map[balancer.SubConn]*ServerForPick
 	pservers []*ServerForPick
@@ -167,12 +167,12 @@ func (b *corelibBalancer) UpdateSubConnState(sc balancer.SubConn, s balancer.Sub
 		return
 	}
 	if s.ConnectivityState == connectivity.Idle && atomic.LoadInt32(&exist.status) == int32(connectivity.Ready) {
-		log.Info(nil, "[grpc.client] server:", b.c.appname+":"+exist.addr, "offline")
+		log.Info(nil, "[cgrpc.client] server:", b.c.appname+":"+exist.addr, "offline")
 	} else if s.ConnectivityState == connectivity.Ready {
 		b.c.resolver.wakemanual()
-		log.Info(nil, "[grpc.client] server:", b.c.appname+":"+exist.addr, "online")
+		log.Info(nil, "[cgrpc.client] server:", b.c.appname+":"+exist.addr, "online")
 	} else if s.ConnectivityState == connectivity.TransientFailure {
-		log.Error(nil, "[grpc.client] connect to server:", b.c.appname+":"+exist.addr, "error:", s.ConnectionError)
+		log.Error(nil, "[cgrpc.client] connect to server:", b.c.appname+":"+exist.addr, "error:", s.ConnectionError)
 	}
 	olds := atomic.LoadInt32(&exist.status)
 	atomic.StoreInt32(&exist.status, int32(s.ConnectivityState))

grpc/client.go cgrpc/client.go

@@ -1,4 +1,4 @@
-package grpc
+package cgrpc
 
 import (
 	"context"
@@ -30,7 +30,7 @@ import (
 
 type PickHandler func(servers []*ServerForPick) *ServerForPick
 
-type DiscoveryHandler func(group, name string, manually <-chan *struct{}, client *GrpcClient)
+type DiscoveryHandler func(group, name string, manually <-chan *struct{}, client *CGrpcClient)
 
 type ClientConfig struct {
 	ConnTimeout   time.Duration
@@ -76,7 +76,7 @@ func (c *ClientConfig) validate() {
 	}
 }
 
-type GrpcClient struct {
+type CGrpcClient struct {
 	c           *ClientConfig
 	selfappname string
 	appname     string
@@ -85,7 +85,7 @@ type GrpcClient struct {
 	balancer    *corelibBalancer
 }
 
-func NewGrpcClient(c *ClientConfig, selfgroup, selfname, group, name string) (*GrpcClient, error) {
+func NewCGrpcClient(c *ClientConfig, selfgroup, selfname, group, name string) (*CGrpcClient, error) {
 	if e := common.NameCheck(selfname, false, true, false, true); e != nil {
 		return nil, e
 	}
@@ -107,17 +107,17 @@ func NewGrpcClient(c *ClientConfig, selfgroup, selfname, group, name string) (*G
 		return nil, e
 	}
 	if c == nil {
-		return nil, errors.New("[grpc.client] missing config")
+		return nil, errors.New("[cgrpc.client] missing config")
 	}
 	if c.Discover == nil {
-		return nil, errors.New("[grpc.client] missing discover in config")
+		return nil, errors.New("[cgrpc.client] missing discover in config")
 	}
 	if c.Picker == nil {
-		log.Warning(nil, "[grpc.client] missing picker in config,default picker will be used")
+		log.Warning(nil, "[cgrpc.client] missing picker in config,default picker will be used")
 		c.Picker = defaultPicker
 	}
 	c.validate()
-	clientinstance := &GrpcClient{
+	clientinstance := &CGrpcClient{
 		c:           c,
 		selfappname: selfappname,
 		appname:     appname,
@@ -133,10 +133,10 @@ func NewGrpcClient(c *ClientConfig, selfgroup, selfname, group, name string) (*G
 			for _, cert := range c.CAs {
 				certPEM, e := os.ReadFile(cert)
 				if e != nil {
-					return nil, errors.New("[grpc.client] read cert file:" + cert + " error:" + e.Error())
+					return nil, errors.New("[cgrpc.client] read cert file:" + cert + " error:" + e.Error())
 				}
 				if !certpool.AppendCertsFromPEM(certPEM) {
-					return nil, errors.New("[grpc.client] load cert file:" + cert + " error:" + e.Error())
+					return nil, errors.New("[cgrpc.client] load cert file:" + cert + " error:" + e.Error())
 				}
 			}
 		}
@@ -176,7 +176,7 @@ type RegisterData struct {
 }
 
 //all: key server's addr "ip:port"
-func (c *GrpcClient) UpdateDiscovery(all map[string]*RegisterData) {
+func (c *CGrpcClient) UpdateDiscovery(all map[string]*RegisterData) {
 	s := resolver.State{
 		Addresses: make([]resolver.Address, 0, len(all)),
 	}
@@ -194,7 +194,7 @@ func (c *GrpcClient) UpdateDiscovery(all map[string]*RegisterData) {
 	}
 	c.resolver.cc.UpdateState(s)
 }
-func (c *GrpcClient) Call(ctx context.Context, path string, req interface{}, resp interface{}, metadata map[string]string) error {
+func (c *CGrpcClient) Call(ctx context.Context, path string, req interface{}, resp interface{}, metadata map[string]string) error {
 	start := time.Now()
 	if c.c.GlobalTimeout != 0 {
 		var cancel context.CancelFunc

grpc/context.go cgrpc/context.go

@@ -1,4 +1,4 @@
-package grpc
+package cgrpc
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
-func (s *GrpcServer) getcontext(c context.Context, path string, peername string, peeraddr string, metadata map[string]string, handlers []OutsideHandler, d func(interface{}) error) *Context {
+func (s *CGrpcServer) getcontext(c context.Context, path string, peername string, peeraddr string, metadata map[string]string, handlers []OutsideHandler, d func(interface{}) error) *Context {
 	ctx, ok := s.ctxpool.Get().(*Context)
 	if !ok {
 		return &Context{
@@ -35,7 +35,7 @@ func (s *GrpcServer) getcontext(c context.Context, path string, peername string,
 	ctx.status = 0
 	return ctx
 }
-func (s *GrpcServer) putcontext(ctx *Context) {
+func (s *CGrpcServer) putcontext(ctx *Context) {
 	s.ctxpool.Put(ctx)
 }
 
@@ -66,7 +66,7 @@ func (c *Context) Abort(e error) {
 	c.status = -1
 	c.e = cerror.ConvertStdError(e)
 	if c.e != nil && (c.e.Httpcode < 400 || c.e.Httpcode > 999) {
-		panic("[grpc.Context.Abort] httpcode must in [400,999]")
+		panic("[cgrpc.Context.Abort] httpcode must in [400,999]")
 	}
 }
 

grpc/error.go cgrpc/error.go

@@ -1,4 +1,4 @@
-package grpc
+package cgrpc
 
 import (
 	"net/http"
@@ -7,9 +7,9 @@ import (
 )
 
 var (
-	ErrNoapi    = &error.Error{Code: 3001, Httpcode: http.StatusNotImplemented, Msg: "[grpc] api not implement"}
-	errClosing  = &error.Error{Code: 3002, Httpcode: http.StatusInternalServerError, Msg: "[grpc] server is closing"}
-	ErrPanic    = &error.Error{Code: 3003, Httpcode: http.StatusServiceUnavailable, Msg: "[grpc] server panic"}
-	ErrNoserver = &error.Error{Code: 3004, Httpcode: http.StatusServiceUnavailable, Msg: "[grpc] no servers"}
-	ErrClosed   = &error.Error{Code: 3005, Httpcode: http.StatusInternalServerError, Msg: "[grpc] connection closed"}
+	ErrNoapi    = &error.Error{Code: 3001, Httpcode: http.StatusNotImplemented, Msg: "[cgrpc] api not implement"}
+	errClosing  = &error.Error{Code: 3002, Httpcode: http.StatusInternalServerError, Msg: "[cgrpc] server is closing"}
+	ErrPanic    = &error.Error{Code: 3003, Httpcode: http.StatusServiceUnavailable, Msg: "[cgrpc] server panic"}
+	ErrNoserver = &error.Error{Code: 3004, Httpcode: http.StatusServiceUnavailable, Msg: "[cgrpc] no servers"}
+	ErrClosed   = &error.Error{Code: 3005, Httpcode: http.StatusInternalServerError, Msg: "[cgrpc] connection closed"}
 )

grpc/mids/mids.go cgrpc/mids/mids.go

@@ -1,25 +1,25 @@
 package mids
 
 import (
+	"github.com/chenjie199234/Corelib/cgrpc"
 	cerror "github.com/chenjie199234/Corelib/error"
-	"github.com/chenjie199234/Corelib/grpc"
 	publicmids "github.com/chenjie199234/Corelib/mids"
 )
 
 //dosn't include global mids in here
-var all map[string]grpc.OutsideHandler
+var all map[string]cgrpc.OutsideHandler
 
 func init() {
-	all = make(map[string]grpc.OutsideHandler)
+	all = make(map[string]cgrpc.OutsideHandler)
 	//register here
 	all["rate"] = rate
 }
 
-func AllMids() map[string]grpc.OutsideHandler {
+func AllMids() map[string]cgrpc.OutsideHandler {
 	return all
 }
 
-func rate(ctx *grpc.Context) {
+func rate(ctx *cgrpc.Context) {
 	if !publicmids.GrpcRate(ctx.GetPath()) {
 		ctx.Abort(cerror.ErrLimit)
 	}

grpc/picker.go cgrpc/picker.go

@@ -1,4 +1,4 @@
-package grpc
+package cgrpc
 
 import (
 	"math"

grpc/protoc-gen-go-grpc/README.md cgrpc/protoc-gen-go-cgrpc/README.md

@@ -16,15 +16,15 @@ const (
 	regexpPackage   = protogen.GoImportPath("regexp")
 	contextPackage  = protogen.GoImportPath("context")
 	protoPackage    = protogen.GoImportPath("google.golang.org/protobuf/proto")
-	grpcPackage     = protogen.GoImportPath("github.com/chenjie199234/Corelib/grpc")
+	cgrpcPackage    = protogen.GoImportPath("github.com/chenjie199234/Corelib/cgrpc")
 	logPackage      = protogen.GoImportPath("github.com/chenjie199234/Corelib/log")
 	commonPackage   = protogen.GoImportPath("github.com/chenjie199234/Corelib/util/common")
 	metadataPackage = protogen.GoImportPath("github.com/chenjie199234/Corelib/metadata")
 	errorPackage    = protogen.GoImportPath("github.com/chenjie199234/Corelib/error")
 )
 
 func generateFile(gen *protogen.Plugin, file *protogen.File) *protogen.GeneratedFile {
-	filename := file.GeneratedFilenamePrefix + "_grpc.pb.go"
+	filename := file.GeneratedFilenamePrefix + "_cgrpc.pb.go"
 	g := gen.NewGeneratedFile(filename, file.GoImportPath)
 
 	genFileComment(gen, file, g)
@@ -42,7 +42,7 @@ func generateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 }
 func genFileComment(gen *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFile) {
 	//add version comments
-	g.P("// Code generated by protoc-gen-go-grpc. DO NOT EDIT.")
+	g.P("// Code generated by protoc-gen-go-cgrpc. DO NOT EDIT.")
 	g.P("// version:")
 	protocVersion := "(unknown)"
 	if v := gen.Request.GetCompilerVersion(); v != nil {
@@ -51,7 +51,7 @@ func genFileComment(gen *protogen.Plugin, file *protogen.File, g *protogen.Gener
 			protocVersion += "-" + s
 		}
 	}
-	g.P("// \tprotoc-gen-go-grpc ", version)
+	g.P("// \tprotoc-gen-go-cgrpc ", version)
 	g.P("// \tprotoc             ", protocVersion)
 	g.P("// source: ", file.Desc.Path())
 	g.P()
@@ -68,15 +68,15 @@ func genPath(file *protogen.File, service *protogen.Service, g *protogen.Generat
 		if method.Desc.Options().(*descriptorpb.MethodOptions).GetDeprecated() {
 			continue
 		}
-		pathname := "_GrpcPath" + service.GoName + method.GoName
+		pathname := "_CGrpcPath" + service.GoName + method.GoName
 		pathurl := "/" + *file.Proto.Package + "." + string(service.Desc.Name()) + "/" + string(method.Desc.Name())
 		g.P("var ", pathname, "=", strconv.Quote(pathurl))
 	}
 	g.P()
 }
 func genServer(file *protogen.File, service *protogen.Service, g *protogen.GeneratedFile) {
 	// Server interface.
-	serverName := service.GoName + "GrpcServer"
+	serverName := service.GoName + "CGrpcServer"
 
 	g.P("type ", serverName, " interface {")
 	for _, method := range service.Methods {
@@ -94,11 +94,11 @@ func genServer(file *protogen.File, service *protogen.Service, g *protogen.Gener
 		if method.Desc.Options().(*descriptorpb.MethodOptions).GetDeprecated() {
 			continue
 		}
-		fname := "func _" + service.GoName + "_" + method.GoName + "_" + "GrpcHandler"
+		fname := "func _" + service.GoName + "_" + method.GoName + "_" + "CGrpcHandler"
 		p1 := "handler func (" + g.QualifiedGoIdent(contextPackage.Ident("Context")) + ",*" + g.QualifiedGoIdent(method.Input.GoIdent) + ")(*" + g.QualifiedGoIdent(method.Output.GoIdent) + ",error)"
-		freturn := g.QualifiedGoIdent(grpcPackage.Ident("OutsideHandler"))
+		freturn := g.QualifiedGoIdent(cgrpcPackage.Ident("OutsideHandler"))
 		g.P(fname, "(", p1, ")", freturn, "{")
-		g.P("return func(ctx *", g.QualifiedGoIdent(grpcPackage.Ident("Context")), "){")
+		g.P("return func(ctx *", g.QualifiedGoIdent(cgrpcPackage.Ident("Context")), "){")
 		g.P("req:=new(", g.QualifiedGoIdent(method.Input.GoIdent), ")")
 		g.P("if ctx.DecodeReq(req)!=nil{")
 		g.P("ctx.Abort(", g.QualifiedGoIdent(errorPackage.Ident("ErrReq")), ")")
@@ -128,7 +128,7 @@ func genServer(file *protogen.File, service *protogen.Service, g *protogen.Gener
 	}
 
 	//Server Register
-	g.P("func Register", serverName, "(engine *", g.QualifiedGoIdent(grpcPackage.Ident("GrpcServer")), ",svc ", serverName, ",allmids map[string]", g.QualifiedGoIdent(grpcPackage.Ident("OutsideHandler")), "){")
+	g.P("func Register", serverName, "(engine *", g.QualifiedGoIdent(cgrpcPackage.Ident("CGrpcServer")), ",svc ", serverName, ",allmids map[string]", g.QualifiedGoIdent(cgrpcPackage.Ident("OutsideHandler")), "){")
 	g.P("//avoid lint")
 	g.P("_=allmids")
 	for _, method := range service.Methods {
@@ -137,10 +137,10 @@ func genServer(file *protogen.File, service *protogen.Service, g *protogen.Gener
 			continue
 		}
 		var mids []string
-		if proto.HasExtension(mop, pbex.E_GrpcMidwares) {
-			mids = proto.GetExtension(mop, pbex.E_GrpcMidwares).([]string)
+		if proto.HasExtension(mop, pbex.E_CgrpcMidwares) {
+			mids = proto.GetExtension(mop, pbex.E_CgrpcMidwares).([]string)
 		}
-		fname := "_" + service.GoName + "_" + method.GoName + "_" + "GrpcHandler(svc." + method.GoName + ")"
+		fname := "_" + service.GoName + "_" + method.GoName + "_" + "CGrpcHandler(svc." + method.GoName + ")"
 		if len(mids) > 0 {
 			g.P("{")
 			str := ""
@@ -150,7 +150,7 @@ func genServer(file *protogen.File, service *protogen.Service, g *protogen.Gener
 			}
 			str = str[1:]
 			g.P("requiredMids:=[]string{", str, "}")
-			g.P("mids:=make([]", g.QualifiedGoIdent(grpcPackage.Ident("OutsideHandler")), ",0,", len(mids)+1, ")")
+			g.P("mids:=make([]", g.QualifiedGoIdent(cgrpcPackage.Ident("OutsideHandler")), ",0,", len(mids)+1, ")")
 			g.P("for _,v:=range requiredMids{")
 			g.P("if mid,ok:=allmids[v];ok{")
 			g.P("mids = append(mids,mid)")
@@ -169,7 +169,7 @@ func genServer(file *protogen.File, service *protogen.Service, g *protogen.Gener
 }
 func genClient(file *protogen.File, service *protogen.Service, g *protogen.GeneratedFile) {
 	// Client interface.
-	clientName := service.GoName + "GrpcClient"
+	clientName := service.GoName + "CGrpcClient"
 	lowclientName := strings.ToLower(clientName[:1]) + clientName[1:]
 
 	g.P("type ", clientName, " interface {")
@@ -184,9 +184,9 @@ func genClient(file *protogen.File, service *protogen.Service, g *protogen.Gener
 	g.P("}")
 	g.P()
 	g.P("type ", lowclientName, " struct{")
-	g.P("cc *", g.QualifiedGoIdent(grpcPackage.Ident("GrpcClient")))
+	g.P("cc *", g.QualifiedGoIdent(cgrpcPackage.Ident("CGrpcClient")))
 	g.P("}")
-	g.P("func New", clientName, "(c *", g.QualifiedGoIdent(grpcPackage.Ident("GrpcClient")), ")(", clientName, "){")
+	g.P("func New", clientName, "(c *", g.QualifiedGoIdent(cgrpcPackage.Ident("CGrpcClient")), ")(", clientName, "){")
 	g.P("return &", lowclientName, "{cc:c}")
 	g.P("}")
 	g.P()
@@ -196,7 +196,7 @@ func genClient(file *protogen.File, service *protogen.Service, g *protogen.Gener
 		if mop.GetDeprecated() {
 			continue
 		}
-		pathname := "_GrpcPath" + service.GoName + method.GoName
+		pathname := "_CGrpcPath" + service.GoName + method.GoName
 		p1 := "ctx " + g.QualifiedGoIdent(contextPackage.Ident("Context"))
 		p2 := "req *" + g.QualifiedGoIdent(method.Input.GoIdent)
 		freturn := "(*" + g.QualifiedGoIdent(method.Output.GoIdent) + ",error)"

grpc/protoc-gen-go-grpc/grpc.go cgrpc/protoc-gen-go-cgrpc/cgrpc.go

@@ -41,7 +41,7 @@ func main() {
 				}
 			}
 			//delete old file
-			oldfile := f.GeneratedFilenamePrefix + "_grpc.pb.go"
+			oldfile := f.GeneratedFilenamePrefix + "_cgrpc.pb.go"
 			if e := os.RemoveAll(oldfile); e != nil {
 				panic("remove old file " + oldfile + " error:" + e.Error())
 			}

grpc/protoc-gen-go-grpc/main.go cgrpc/protoc-gen-go-cgrpc/main.go

@@ -1,4 +1,4 @@
-package grpc
+package cgrpc
 
 import (
 	"context"
@@ -9,7 +9,7 @@ import (
 )
 
 type resolverBuilder struct {
-	c *GrpcClient
+	c *CGrpcClient
 }
 
 func (b *resolverBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {