diff --git a/helloworld/handler/helloworld.go b/helloworld/handler/helloworld.go index f753b2f..753abd6 100644 --- a/helloworld/handler/helloworld.go +++ b/helloworld/handler/helloworld.go @@ -15,3 +15,18 @@ func (e *Helloworld) Call(ctx context.Context, req *helloworld.Request, rsp *hel rsp.Message = "Hello " + req.Name return nil } + +func (e *Helloworld) Stream(ctx context.Context, req *helloworld.StreamRequest, rsp helloworld.Helloworld_StreamStream) error { + // send one if none + if req.Messages == 0 { + req.Messages = 1 + } + + for i := 0; i < int(req.Messages); i++ { + rsp.Send(&helloworld.StreamResponse{ + Message: "Hello " + req.Name, + }) + } + + return nil +} diff --git a/helloworld/proto/helloworld.pb.go b/helloworld/proto/helloworld.pb.go index eab111b..9c93743 100644 --- a/helloworld/proto/helloworld.pb.go +++ b/helloworld/proto/helloworld.pb.go @@ -115,6 +115,109 @@ func (x *Response) GetMessage() string { return "" } +// Stream returns a streaming helloworld response +type StreamRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Messages int64 `protobuf:"varint,2,opt,name=messages,proto3" json:"messages,omitempty"` +} + +func (x *StreamRequest) Reset() { + *x = StreamRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_proto_helloworld_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StreamRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StreamRequest) ProtoMessage() {} + +func (x *StreamRequest) ProtoReflect() protoreflect.Message { + mi := &file_proto_helloworld_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use StreamRequest.ProtoReflect.Descriptor instead. +func (*StreamRequest) Descriptor() ([]byte, []int) { + return file_proto_helloworld_proto_rawDescGZIP(), []int{2} +} + +func (x *StreamRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *StreamRequest) GetMessages() int64 { + if x != nil { + return x.Messages + } + return 0 +} + +type StreamResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"` +} + +func (x *StreamResponse) Reset() { + *x = StreamResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_proto_helloworld_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *StreamResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StreamResponse) ProtoMessage() {} + +func (x *StreamResponse) ProtoReflect() protoreflect.Message { + mi := &file_proto_helloworld_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use StreamResponse.ProtoReflect.Descriptor instead. +func (*StreamResponse) Descriptor() ([]byte, []int) { + return file_proto_helloworld_proto_rawDescGZIP(), []int{3} +} + +func (x *StreamResponse) GetMessage() string { + if x != nil { + return x.Message + } + return "" +} + var File_proto_helloworld_proto protoreflect.FileDescriptor var file_proto_helloworld_proto_rawDesc = []byte{ @@ -124,13 +227,24 @@ var file_proto_helloworld_proto_rawDesc = []byte{ 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x24, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x41, 0x0a, 0x0a, 0x48, 0x65, 0x6c, - 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x12, 0x33, 0x0a, 0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, - 0x13, 0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, - 0x64, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x14, 0x5a, 0x12, - 0x2e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, - 0x6c, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x3f, 0x0a, 0x0d, 0x53, 0x74, 0x72, + 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, + 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x22, 0x2a, 0x0a, 0x0e, 0x53, 0x74, + 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x86, 0x01, 0x0a, 0x0a, 0x48, 0x65, 0x6c, 0x6c, 0x6f, + 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x12, 0x33, 0x0a, 0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x13, 0x2e, + 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x06, 0x53, 0x74, + 0x72, 0x65, 0x61, 0x6d, 0x12, 0x19, 0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, + 0x64, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1a, 0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x53, 0x74, 0x72, + 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, + 0x14, 0x5a, 0x12, 0x2e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x68, 0x65, 0x6c, 0x6c, 0x6f, + 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -145,16 +259,20 @@ func file_proto_helloworld_proto_rawDescGZIP() []byte { return file_proto_helloworld_proto_rawDescData } -var file_proto_helloworld_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_proto_helloworld_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_proto_helloworld_proto_goTypes = []interface{}{ - (*Request)(nil), // 0: helloworld.Request - (*Response)(nil), // 1: helloworld.Response + (*Request)(nil), // 0: helloworld.Request + (*Response)(nil), // 1: helloworld.Response + (*StreamRequest)(nil), // 2: helloworld.StreamRequest + (*StreamResponse)(nil), // 3: helloworld.StreamResponse } var file_proto_helloworld_proto_depIdxs = []int32{ 0, // 0: helloworld.Helloworld.Call:input_type -> helloworld.Request - 1, // 1: helloworld.Helloworld.Call:output_type -> helloworld.Response - 1, // [1:2] is the sub-list for method output_type - 0, // [0:1] is the sub-list for method input_type + 2, // 1: helloworld.Helloworld.Stream:input_type -> helloworld.StreamRequest + 1, // 2: helloworld.Helloworld.Call:output_type -> helloworld.Response + 3, // 3: helloworld.Helloworld.Stream:output_type -> helloworld.StreamResponse + 2, // [2:4] is the sub-list for method output_type + 0, // [0:2] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name 0, // [0:0] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name @@ -190,6 +308,30 @@ func file_proto_helloworld_proto_init() { return nil } } + file_proto_helloworld_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StreamRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_proto_helloworld_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*StreamResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -197,7 +339,7 @@ func file_proto_helloworld_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_proto_helloworld_proto_rawDesc, NumEnums: 0, - NumMessages: 2, + NumMessages: 4, NumExtensions: 0, NumServices: 1, }, diff --git a/helloworld/proto/helloworld.pb.micro.go b/helloworld/proto/helloworld.pb.micro.go index fb53e14..6e37811 100644 --- a/helloworld/proto/helloworld.pb.micro.go +++ b/helloworld/proto/helloworld.pb.micro.go @@ -43,6 +43,7 @@ func NewHelloworldEndpoints() []*api.Endpoint { type HelloworldService interface { Call(ctx context.Context, in *Request, opts ...client.CallOption) (*Response, error) + Stream(ctx context.Context, in *StreamRequest, opts ...client.CallOption) (Helloworld_StreamService, error) } type helloworldService struct { @@ -67,15 +68,66 @@ func (c *helloworldService) Call(ctx context.Context, in *Request, opts ...clien return out, nil } +func (c *helloworldService) Stream(ctx context.Context, in *StreamRequest, opts ...client.CallOption) (Helloworld_StreamService, error) { + req := c.c.NewRequest(c.name, "Helloworld.Stream", &StreamRequest{}) + stream, err := c.c.Stream(ctx, req, opts...) + if err != nil { + return nil, err + } + if err := stream.Send(in); err != nil { + return nil, err + } + return &helloworldServiceStream{stream}, nil +} + +type Helloworld_StreamService interface { + Context() context.Context + SendMsg(interface{}) error + RecvMsg(interface{}) error + Close() error + Recv() (*StreamResponse, error) +} + +type helloworldServiceStream struct { + stream client.Stream +} + +func (x *helloworldServiceStream) Close() error { + return x.stream.Close() +} + +func (x *helloworldServiceStream) Context() context.Context { + return x.stream.Context() +} + +func (x *helloworldServiceStream) SendMsg(m interface{}) error { + return x.stream.Send(m) +} + +func (x *helloworldServiceStream) RecvMsg(m interface{}) error { + return x.stream.Recv(m) +} + +func (x *helloworldServiceStream) Recv() (*StreamResponse, error) { + m := new(StreamResponse) + err := x.stream.Recv(m) + if err != nil { + return nil, err + } + return m, nil +} + // Server API for Helloworld service type HelloworldHandler interface { Call(context.Context, *Request, *Response) error + Stream(context.Context, *StreamRequest, Helloworld_StreamStream) error } func RegisterHelloworldHandler(s server.Server, hdlr HelloworldHandler, opts ...server.HandlerOption) error { type helloworld interface { Call(ctx context.Context, in *Request, out *Response) error + Stream(ctx context.Context, stream server.Stream) error } type Helloworld struct { helloworld @@ -91,3 +143,43 @@ type helloworldHandler struct { func (h *helloworldHandler) Call(ctx context.Context, in *Request, out *Response) error { return h.HelloworldHandler.Call(ctx, in, out) } + +func (h *helloworldHandler) Stream(ctx context.Context, stream server.Stream) error { + m := new(StreamRequest) + if err := stream.Recv(m); err != nil { + return err + } + return h.HelloworldHandler.Stream(ctx, m, &helloworldStreamStream{stream}) +} + +type Helloworld_StreamStream interface { + Context() context.Context + SendMsg(interface{}) error + RecvMsg(interface{}) error + Close() error + Send(*StreamResponse) error +} + +type helloworldStreamStream struct { + stream server.Stream +} + +func (x *helloworldStreamStream) Close() error { + return x.stream.Close() +} + +func (x *helloworldStreamStream) Context() context.Context { + return x.stream.Context() +} + +func (x *helloworldStreamStream) SendMsg(m interface{}) error { + return x.stream.Send(m) +} + +func (x *helloworldStreamStream) RecvMsg(m interface{}) error { + return x.stream.Recv(m) +} + +func (x *helloworldStreamStream) Send(m *StreamResponse) error { + return x.stream.Send(m) +} diff --git a/helloworld/proto/helloworld.proto b/helloworld/proto/helloworld.proto index 49a7a52..ec8573f 100644 --- a/helloworld/proto/helloworld.proto +++ b/helloworld/proto/helloworld.proto @@ -6,6 +6,7 @@ option go_package = "./proto;helloworld"; service Helloworld { rpc Call(Request) returns (Response) {} + rpc Stream(StreamRequest) returns (stream StreamResponse) {}; } // Call returns a personalised "Hello $name" response @@ -16,3 +17,13 @@ message Request { message Response { string message = 1; } + +// Stream returns a streaming helloworld response +message StreamRequest { + string name = 1; + int64 messages = 2; +} + +message StreamResponse { + string message = 1; +}