update

Author: chenjie199234

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

@@ -456,19 +456,25 @@ func genClient(file *protogen.File, service *protogen.Service, g *protogen.Gener
 			g.P("ServerStreams:true,")
 			g.P("StreamName:\"", method.Desc.Name(), "\",")
 			g.P("}")
+			g.P("ctx,cancel := ", g.QualifiedGoIdent(contextPackage.Ident("WithCancel")), "(ctx)")
 			g.P("stream,e:=c.cc.NewStream(ctx,desc,", pathname, ")")
 			g.P("if e!=nil{")
+			g.P("cancel()")
 			g.P("return e")
 			g.P("}")
 			g.P("if e:= stream.SendMsg(req);e!=nil{")
 			g.P(g.QualifiedGoIdent(slogPackage.Ident("ErrorContext")), "(ctx,\"[", pathurl, "] send request failed\",", g.QualifiedGoIdent(slogPackage.Ident("String")), "(\"error\",e.Error()))")
+			g.P("cancel()")
 			g.P("return e")
 			g.P("}")
 			g.P("if e:=stream.CloseSend();e!=nil{")
 			g.P(g.QualifiedGoIdent(slogPackage.Ident("ErrorContext")), "(ctx,\"[", pathurl, "] send request failed\",", g.QualifiedGoIdent(slogPackage.Ident("String")), "(\"error\",e.Error()))")
+			g.P("cancel()")
 			g.P("return e")
 			g.P("}")
-			g.P("return handler(", g.QualifiedGoIdent(cgrpcPackage.Ident("NewServerStreamClientContext")), "[", g.QualifiedGoIdent(method.Output.GoIdent), "](", pathname, ",", "stream))")
+			g.P("e=handler(", g.QualifiedGoIdent(cgrpcPackage.Ident("NewServerStreamClientContext")), "[", g.QualifiedGoIdent(method.Output.GoIdent), "](", pathname, ",", "stream))")
+			g.P("cancel()")
+			g.P("return e")
 			g.P("}")
 		}
 		if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
@@ -507,12 +513,15 @@ func genClient(file *protogen.File, service *protogen.Service, g *protogen.Gener
 			g.P("ServerStreams:true,")
 			g.P("StreamName:\"", method.Desc.Name(), "\",")
 			g.P("}")
+			g.P("ctx,cancel := ", g.QualifiedGoIdent(contextPackage.Ident("WithCancel")), "(ctx)")
 			g.P("stream,e:=c.cc.NewStream(ctx,desc,", pathname, ")")
 			g.P("if e!=nil{")
+			g.P("cancel()")
 			g.P("return e")
 			g.P("}")
 			g.P("e = handler(", g.QualifiedGoIdent(cgrpcPackage.Ident("NewAllStreamClientContext")), "[", g.QualifiedGoIdent(method.Input.GoIdent), ",", g.QualifiedGoIdent(method.Output.GoIdent), "](", pathname, ",stream,", pbex.NeedValidate(method.Input), "))")
 			g.P("stream.CloseSend()")
+			g.P("cancel()")
 			g.P("return e")
 			g.P("}")
 		}

internal/version/version.go

@@ -4,7 +4,7 @@ import "fmt"
 
 var major = 0
 var minor = 0
-var patch = 124
+var patch = 125
 var status = ""
 
 func String() string {