unistack-org/protoc-gen-go-micro
4
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases 61 Wiki Activity

fix streaming methods

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-02-23 18:45:03 +03:00
parent 2ef183d1b4
commit fc763a645d
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
util.go
View File

@ -163,8 +163,11 @@ func generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protog
serviceName := strings.TrimSuffix(service.GoName, "Service") serviceName := strings.TrimSuffix(service.GoName, "Service")
for _, method := range service.Methods { for _, method := range service.Methods {
//methodName := fmt.Sprintf("%s.%s", serviceName, method.GoName) //methodName := fmt.Sprintf("%s.%s", serviceName, method.GoName)
gfile.P("func (h *", lowerFirst(serviceName), "Handler) ", generateServerSignature(serviceName, method), "{") if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
generateServerSignature(serviceName, method) gfile.P("func (h *", lowerFirst(serviceName), "Handler) ", method.GoName, "(ctx context.Context, stream micro_server.Stream) error {")
} else {
gfile.P("func (h *", lowerFirst(serviceName), "Handler) ", generateServerSignature(serviceName, method), "{")
}
if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() { if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
if !method.Desc.IsStreamingClient() { if !method.Desc.IsStreamingClient() {
@ -172,7 +175,7 @@ func generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protog
gfile.P("if err := stream.Recv(m); err != nil {") gfile.P("if err := stream.Recv(m); err != nil {")
gfile.P("return err") gfile.P("return err")
gfile.P("}") gfile.P("}")
gfile.P("return h.", serviceName, "Handler.", method.GoName, "(ctx, m, &", lowerFirst(serviceName), method.GoName, ",Stream{stream})") gfile.P("return h.", serviceName, "Handler.", method.GoName, "(ctx, m, &", lowerFirst(serviceName), method.GoName, "Stream{stream})")
} else { } else {
gfile.P("return h.", serviceName, "Handler.", method.GoName, "(ctx, &", lowerFirst(serviceName), method.GoName, "Stream{stream})") gfile.P("return h.", serviceName, "Handler.", method.GoName, "(ctx, &", lowerFirst(serviceName), method.GoName, "Stream{stream})")
} }
@ -246,7 +249,11 @@ func generateServiceRegister(gfile *protogen.GeneratedFile, service *protogen.Se
gfile.P("func Register", serviceName, "Handler(s micro_server.Server, sh ", serviceName, "Handler, opts ...micro_server.HandlerOption) error {") gfile.P("func Register", serviceName, "Handler(s micro_server.Server, sh ", serviceName, "Handler, opts ...micro_server.HandlerOption) error {")
gfile.P("type ", lowerFirst(serviceName), " interface {") gfile.P("type ", lowerFirst(serviceName), " interface {")
for _, method := range service.Methods { for _, method := range service.Methods {
gfile.P(generateServerSignature(serviceName, method)) if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
gfile.P(method.GoName, "(ctx context.Context, stream micro_server.Stream) error")
} else {
gfile.P(generateServerSignature(serviceName, method))
}
} }
gfile.P("}") gfile.P("}")
gfile.P("type ", serviceName, " struct {") gfile.P("type ", serviceName, " struct {")
@ -322,15 +329,17 @@ func generateServiceClientStreamInterface(gfile *protogen.GeneratedFile, service
gfile.P("SendMsg(msg interface{}) error") gfile.P("SendMsg(msg interface{}) error")
gfile.P("RecvMsg(msg interface{}) error") gfile.P("RecvMsg(msg interface{}) error")
if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() { if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
gfile.P("RecvAndClose() (", method.Output.Desc.Name(), ", error)") gfile.P("RecvAndClose() (*", method.Output.Desc.Name(), ", error)")
} }
gfile.P("Close() error") gfile.P("Close() error")
if method.Desc.IsStreamingClient() { if method.Desc.IsStreamingClient() {
gfile.P("Send(msg *", method.Input.Desc.Name(), ") error") gfile.P("Send(msg *", method.Input.Desc.Name(), ") error")
} }
if method.Desc.IsStreamingServer() { if method.Desc.IsStreamingServer() {
gfile.P("Recv() (msg *", method.Output.Desc.Name(), ", error)") gfile.P("Recv() (*", method.Output.Desc.Name(), ", error)")
} }
gfile.P("}")
gfile.P()
} }
} }
@ -350,11 +359,13 @@ func generateServiceServerStreamInterface(gfile *protogen.GeneratedFile, service
} }
gfile.P("Close() error") gfile.P("Close() error")
if method.Desc.IsStreamingClient() { if method.Desc.IsStreamingClient() {
gfile.P("Send(msg *", method.Output.Desc.Name(), ") error") gfile.P("Recv() (*", method.Input.Desc.Name(), ", error)")
} }
if method.Desc.IsStreamingServer() { if method.Desc.IsStreamingServer() {
gfile.P("Recv() (msg *", method.Input.Desc.Name(), ", error)") gfile.P("Send(msg *", method.Output.Desc.Name(), ") error")
} }
gfile.P("}")
gfile.P()
} }
} }