From eb7f9e67b5b95d468668f646b1affc9d03ae0b0c Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Tue, 27 Jun 2017 19:50:49 +0900 Subject: [PATCH] chaos --- echoserver/echoserver.pb.go | 376 --------------------------------- echoserver/echoserver.pb.gw.go | 287 ------------------------- echoserver/echoserver.proto | 37 ---- echoserver/Makefile => ws/cmd | 3 - ws/ws.proto | 24 +++ 5 files changed, 24 insertions(+), 703 deletions(-) delete mode 100644 echoserver/echoserver.pb.go delete mode 100644 echoserver/echoserver.pb.gw.go delete mode 100644 echoserver/echoserver.proto rename echoserver/Makefile => ws/cmd (53%) create mode 100644 ws/ws.proto diff --git a/echoserver/echoserver.pb.go b/echoserver/echoserver.pb.go deleted file mode 100644 index 2b4177e..0000000 --- a/echoserver/echoserver.pb.go +++ /dev/null @@ -1,376 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// source: echoserver/echoserver.proto - -/* -Package echoserver is a generated protocol buffer package. - -It is generated from these files: - echoserver/echoserver.proto - -It has these top-level messages: - EchoRequest - EchoResponse - Heartbeat - Empty -*/ -package echoserver - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "google.golang.org/genproto/googleapis/api/annotations" - -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package - -type Heartbeat_Status int32 - -const ( - Heartbeat_UNKNOWN Heartbeat_Status = 0 - Heartbeat_OK Heartbeat_Status = 1 -) - -var Heartbeat_Status_name = map[int32]string{ - 0: "UNKNOWN", - 1: "OK", -} -var Heartbeat_Status_value = map[string]int32{ - "UNKNOWN": 0, - "OK": 1, -} - -func (x Heartbeat_Status) String() string { - return proto.EnumName(Heartbeat_Status_name, int32(x)) -} -func (Heartbeat_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} } - -type EchoRequest struct { - Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"` -} - -func (m *EchoRequest) Reset() { *m = EchoRequest{} } -func (m *EchoRequest) String() string { return proto.CompactTextString(m) } -func (*EchoRequest) ProtoMessage() {} -func (*EchoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } - -func (m *EchoRequest) GetMessage() string { - if m != nil { - return m.Message - } - return "" -} - -type EchoResponse struct { - Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"` -} - -func (m *EchoResponse) Reset() { *m = EchoResponse{} } -func (m *EchoResponse) String() string { return proto.CompactTextString(m) } -func (*EchoResponse) ProtoMessage() {} -func (*EchoResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } - -func (m *EchoResponse) GetMessage() string { - if m != nil { - return m.Message - } - return "" -} - -type Heartbeat struct { - Status Heartbeat_Status `protobuf:"varint,1,opt,name=status,enum=echoserver.Heartbeat_Status" json:"status,omitempty"` -} - -func (m *Heartbeat) Reset() { *m = Heartbeat{} } -func (m *Heartbeat) String() string { return proto.CompactTextString(m) } -func (*Heartbeat) ProtoMessage() {} -func (*Heartbeat) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } - -func (m *Heartbeat) GetStatus() Heartbeat_Status { - if m != nil { - return m.Status - } - return Heartbeat_UNKNOWN -} - -type Empty struct { -} - -func (m *Empty) Reset() { *m = Empty{} } -func (m *Empty) String() string { return proto.CompactTextString(m) } -func (*Empty) ProtoMessage() {} -func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } - -func init() { - proto.RegisterType((*EchoRequest)(nil), "echoserver.EchoRequest") - proto.RegisterType((*EchoResponse)(nil), "echoserver.EchoResponse") - proto.RegisterType((*Heartbeat)(nil), "echoserver.Heartbeat") - proto.RegisterType((*Empty)(nil), "echoserver.Empty") - proto.RegisterEnum("echoserver.Heartbeat_Status", Heartbeat_Status_name, Heartbeat_Status_value) -} - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 - -// Client API for EchoService service - -type EchoServiceClient interface { - Echo(ctx context.Context, opts ...grpc.CallOption) (EchoService_EchoClient, error) - Stream(ctx context.Context, in *Empty, opts ...grpc.CallOption) (EchoService_StreamClient, error) - Heartbeats(ctx context.Context, opts ...grpc.CallOption) (EchoService_HeartbeatsClient, error) -} - -type echoServiceClient struct { - cc *grpc.ClientConn -} - -func NewEchoServiceClient(cc *grpc.ClientConn) EchoServiceClient { - return &echoServiceClient{cc} -} - -func (c *echoServiceClient) Echo(ctx context.Context, opts ...grpc.CallOption) (EchoService_EchoClient, error) { - stream, err := grpc.NewClientStream(ctx, &_EchoService_serviceDesc.Streams[0], c.cc, "/echoserver.EchoService/Echo", opts...) - if err != nil { - return nil, err - } - x := &echoServiceEchoClient{stream} - return x, nil -} - -type EchoService_EchoClient interface { - Send(*EchoRequest) error - Recv() (*EchoResponse, error) - grpc.ClientStream -} - -type echoServiceEchoClient struct { - grpc.ClientStream -} - -func (x *echoServiceEchoClient) Send(m *EchoRequest) error { - return x.ClientStream.SendMsg(m) -} - -func (x *echoServiceEchoClient) Recv() (*EchoResponse, error) { - m := new(EchoResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *echoServiceClient) Stream(ctx context.Context, in *Empty, opts ...grpc.CallOption) (EchoService_StreamClient, error) { - stream, err := grpc.NewClientStream(ctx, &_EchoService_serviceDesc.Streams[1], c.cc, "/echoserver.EchoService/Stream", opts...) - if err != nil { - return nil, err - } - x := &echoServiceStreamClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - return x, nil -} - -type EchoService_StreamClient interface { - Recv() (*EchoResponse, error) - grpc.ClientStream -} - -type echoServiceStreamClient struct { - grpc.ClientStream -} - -func (x *echoServiceStreamClient) Recv() (*EchoResponse, error) { - m := new(EchoResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *echoServiceClient) Heartbeats(ctx context.Context, opts ...grpc.CallOption) (EchoService_HeartbeatsClient, error) { - stream, err := grpc.NewClientStream(ctx, &_EchoService_serviceDesc.Streams[2], c.cc, "/echoserver.EchoService/Heartbeats", opts...) - if err != nil { - return nil, err - } - x := &echoServiceHeartbeatsClient{stream} - return x, nil -} - -type EchoService_HeartbeatsClient interface { - Send(*Empty) error - Recv() (*Heartbeat, error) - grpc.ClientStream -} - -type echoServiceHeartbeatsClient struct { - grpc.ClientStream -} - -func (x *echoServiceHeartbeatsClient) Send(m *Empty) error { - return x.ClientStream.SendMsg(m) -} - -func (x *echoServiceHeartbeatsClient) Recv() (*Heartbeat, error) { - m := new(Heartbeat) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -// Server API for EchoService service - -type EchoServiceServer interface { - Echo(EchoService_EchoServer) error - Stream(*Empty, EchoService_StreamServer) error - Heartbeats(EchoService_HeartbeatsServer) error -} - -func RegisterEchoServiceServer(s *grpc.Server, srv EchoServiceServer) { - s.RegisterService(&_EchoService_serviceDesc, srv) -} - -func _EchoService_Echo_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(EchoServiceServer).Echo(&echoServiceEchoServer{stream}) -} - -type EchoService_EchoServer interface { - Send(*EchoResponse) error - Recv() (*EchoRequest, error) - grpc.ServerStream -} - -type echoServiceEchoServer struct { - grpc.ServerStream -} - -func (x *echoServiceEchoServer) Send(m *EchoResponse) error { - return x.ServerStream.SendMsg(m) -} - -func (x *echoServiceEchoServer) Recv() (*EchoRequest, error) { - m := new(EchoRequest) - if err := x.ServerStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func _EchoService_Stream_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(Empty) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(EchoServiceServer).Stream(m, &echoServiceStreamServer{stream}) -} - -type EchoService_StreamServer interface { - Send(*EchoResponse) error - grpc.ServerStream -} - -type echoServiceStreamServer struct { - grpc.ServerStream -} - -func (x *echoServiceStreamServer) Send(m *EchoResponse) error { - return x.ServerStream.SendMsg(m) -} - -func _EchoService_Heartbeats_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(EchoServiceServer).Heartbeats(&echoServiceHeartbeatsServer{stream}) -} - -type EchoService_HeartbeatsServer interface { - Send(*Heartbeat) error - Recv() (*Empty, error) - grpc.ServerStream -} - -type echoServiceHeartbeatsServer struct { - grpc.ServerStream -} - -func (x *echoServiceHeartbeatsServer) Send(m *Heartbeat) error { - return x.ServerStream.SendMsg(m) -} - -func (x *echoServiceHeartbeatsServer) Recv() (*Empty, error) { - m := new(Empty) - if err := x.ServerStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -var _EchoService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "echoserver.EchoService", - HandlerType: (*EchoServiceServer)(nil), - Methods: []grpc.MethodDesc{}, - Streams: []grpc.StreamDesc{ - { - StreamName: "Echo", - Handler: _EchoService_Echo_Handler, - ServerStreams: true, - ClientStreams: true, - }, - { - StreamName: "Stream", - Handler: _EchoService_Stream_Handler, - ServerStreams: true, - }, - { - StreamName: "Heartbeats", - Handler: _EchoService_Heartbeats_Handler, - ServerStreams: true, - ClientStreams: true, - }, - }, - Metadata: "echoserver/echoserver.proto", -} - -func init() { proto.RegisterFile("echoserver/echoserver.proto", fileDescriptor0) } - -var fileDescriptor0 = []byte{ - // 303 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x4a, 0xc3, 0x40, - 0x10, 0x86, 0xdd, 0x62, 0x13, 0x3a, 0xb5, 0x52, 0x57, 0xc4, 0x52, 0x2b, 0xc8, 0x5e, 0x2c, 0x1e, - 0x92, 0x52, 0x3d, 0x79, 0xaf, 0x08, 0x85, 0x04, 0x52, 0xc4, 0xab, 0xdb, 0x30, 0x24, 0x01, 0x93, - 0x8d, 0xbb, 0xdb, 0x82, 0x57, 0x5f, 0xc1, 0x47, 0xf3, 0x15, 0x7c, 0x07, 0xaf, 0x92, 0x5d, 0x4d, - 0x23, 0x96, 0xde, 0x32, 0x93, 0x6f, 0xfe, 0xf9, 0xff, 0x59, 0x38, 0xc3, 0x38, 0x15, 0x0a, 0xe5, - 0x1a, 0xa5, 0xbf, 0xf9, 0xf4, 0x4a, 0x29, 0xb4, 0xa0, 0xb0, 0xe9, 0x0c, 0x47, 0x89, 0x10, 0xc9, - 0x33, 0xfa, 0xbc, 0xcc, 0x7c, 0x5e, 0x14, 0x42, 0x73, 0x9d, 0x89, 0x42, 0x59, 0x92, 0x5d, 0x42, - 0x77, 0x16, 0xa7, 0x22, 0xc2, 0x97, 0x15, 0x2a, 0x4d, 0x07, 0xe0, 0xe6, 0xa8, 0x14, 0x4f, 0x70, - 0x40, 0x2e, 0xc8, 0xb8, 0x13, 0xfd, 0x96, 0x6c, 0x0c, 0x07, 0x16, 0x54, 0xa5, 0x28, 0x14, 0xee, - 0x20, 0x9f, 0xa0, 0x73, 0x8f, 0x5c, 0xea, 0x25, 0x72, 0x4d, 0x6f, 0xc0, 0x51, 0x9a, 0xeb, 0x95, - 0x32, 0xd4, 0xe1, 0x74, 0xe4, 0x35, 0xcc, 0xd6, 0x98, 0xb7, 0x30, 0x4c, 0xf4, 0xc3, 0xb2, 0x73, - 0x70, 0x6c, 0x87, 0x76, 0xc1, 0x7d, 0x08, 0xe6, 0x41, 0xf8, 0x18, 0xf4, 0xf7, 0xa8, 0x03, 0xad, - 0x70, 0xde, 0x27, 0xcc, 0x85, 0xf6, 0x2c, 0x2f, 0xf5, 0xeb, 0xf4, 0x8b, 0x58, 0xfb, 0x0b, 0x94, - 0xeb, 0x2c, 0x46, 0x1a, 0xc2, 0x7e, 0x55, 0xd2, 0xd3, 0xe6, 0x96, 0x46, 0xbe, 0xe1, 0xe0, 0xff, - 0x0f, 0x9b, 0x87, 0xf5, 0xdf, 0x3e, 0x3e, 0xdf, 0x5b, 0xc0, 0xda, 0xe6, 0x9a, 0xb7, 0xe4, 0x6a, - 0x4c, 0x26, 0x84, 0xde, 0x55, 0x46, 0x24, 0xf2, 0x9c, 0x1e, 0xfd, 0x99, 0xac, 0xb6, 0xef, 0x10, - 0xeb, 0x19, 0x31, 0x97, 0x5a, 0xb1, 0x09, 0xa1, 0x21, 0x40, 0x1d, 0x56, 0x6d, 0xd3, 0x3a, 0xd9, - 0x7a, 0x17, 0x76, 0x6c, 0x84, 0x7a, 0xac, 0xeb, 0xa7, 0xf5, 0x78, 0x65, 0x6c, 0xe9, 0x98, 0xe7, - 0xbb, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x38, 0x67, 0x6f, 0x07, 0x07, 0x02, 0x00, 0x00, -} diff --git a/echoserver/echoserver.pb.gw.go b/echoserver/echoserver.pb.gw.go deleted file mode 100644 index a7fc9cf..0000000 --- a/echoserver/echoserver.pb.gw.go +++ /dev/null @@ -1,287 +0,0 @@ -// Code generated by protoc-gen-grpc-gateway -// source: echoserver/echoserver.proto -// DO NOT EDIT! - -/* -Package echoserver is a reverse proxy. - -It translates gRPC into RESTful JSON APIs. -*/ -package echoserver - -import ( - "io" - "net/http" - - "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" - "golang.org/x/net/context" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/status" -) - -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray - -func request_EchoService_Echo_0(ctx context.Context, marshaler runtime.Marshaler, client EchoServiceClient, req *http.Request, pathParams map[string]string) (EchoService_EchoClient, runtime.ServerMetadata, error) { - var metadata runtime.ServerMetadata - stream, err := client.Echo(ctx) - if err != nil { - grpclog.Printf("Failed to start streaming: %v", err) - return nil, metadata, err - } - dec := marshaler.NewDecoder(req.Body) - handleSend := func() error { - var protoReq EchoRequest - err = dec.Decode(&protoReq) - if err == io.EOF { - return err - } - if err != nil { - grpclog.Printf("Failed to decode request: %v", err) - return err - } - if err = stream.Send(&protoReq); err != nil { - grpclog.Printf("Failed to send request: %v", err) - return err - } - return nil - } - if err := handleSend(); err != nil { - if cerr := stream.CloseSend(); cerr != nil { - grpclog.Printf("Failed to terminate client stream: %v", cerr) - } - if err == io.EOF { - return stream, metadata, nil - } - return nil, metadata, err - } - go func() { - for { - if err := handleSend(); err != nil { - break - } - } - if err := stream.CloseSend(); err != nil { - grpclog.Printf("Failed to terminate client stream: %v", err) - } - }() - header, err := stream.Header() - if err != nil { - grpclog.Printf("Failed to get header from client: %v", err) - return nil, metadata, err - } - metadata.HeaderMD = header - return stream, metadata, nil -} - -func request_EchoService_Stream_0(ctx context.Context, marshaler runtime.Marshaler, client EchoServiceClient, req *http.Request, pathParams map[string]string) (EchoService_StreamClient, runtime.ServerMetadata, error) { - var protoReq Empty - var metadata runtime.ServerMetadata - - stream, err := client.Stream(ctx, &protoReq) - if err != nil { - return nil, metadata, err - } - header, err := stream.Header() - if err != nil { - return nil, metadata, err - } - metadata.HeaderMD = header - return stream, metadata, nil - -} - -func request_EchoService_Heartbeats_0(ctx context.Context, marshaler runtime.Marshaler, client EchoServiceClient, req *http.Request, pathParams map[string]string) (EchoService_HeartbeatsClient, runtime.ServerMetadata, error) { - var metadata runtime.ServerMetadata - stream, err := client.Heartbeats(ctx) - if err != nil { - grpclog.Printf("Failed to start streaming: %v", err) - return nil, metadata, err - } - dec := marshaler.NewDecoder(req.Body) - handleSend := func() error { - var protoReq Empty - err = dec.Decode(&protoReq) - if err == io.EOF { - return err - } - if err != nil { - grpclog.Printf("Failed to decode request: %v", err) - return err - } - if err = stream.Send(&protoReq); err != nil { - grpclog.Printf("Failed to send request: %v", err) - return err - } - return nil - } - if err := handleSend(); err != nil { - if cerr := stream.CloseSend(); cerr != nil { - grpclog.Printf("Failed to terminate client stream: %v", cerr) - } - if err == io.EOF { - return stream, metadata, nil - } - return nil, metadata, err - } - go func() { - for { - if err := handleSend(); err != nil { - break - } - } - if err := stream.CloseSend(); err != nil { - grpclog.Printf("Failed to terminate client stream: %v", err) - } - }() - header, err := stream.Header() - if err != nil { - grpclog.Printf("Failed to get header from client: %v", err) - return nil, metadata, err - } - metadata.HeaderMD = header - return stream, metadata, nil -} - -// RegisterEchoServiceHandlerFromEndpoint is same as RegisterEchoServiceHandler but -// automatically dials to "endpoint" and closes the connection when "ctx" gets done. -func RegisterEchoServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) - if err != nil { - return err - } - defer func() { - if err != nil { - if cerr := conn.Close(); cerr != nil { - grpclog.Printf("Failed to close conn to %s: %v", endpoint, cerr) - } - return - } - go func() { - <-ctx.Done() - if cerr := conn.Close(); cerr != nil { - grpclog.Printf("Failed to close conn to %s: %v", endpoint, cerr) - } - }() - }() - - return RegisterEchoServiceHandler(ctx, mux, conn) -} - -// RegisterEchoServiceHandler registers the http handlers for service EchoService to "mux". -// The handlers forward requests to the grpc endpoint over "conn". -func RegisterEchoServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { - client := NewEchoServiceClient(conn) - - mux.Handle("POST", pattern_EchoService_Echo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(ctx) - defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_EchoService_Echo_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_EchoService_Echo_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_EchoService_Stream_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(ctx) - defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_EchoService_Stream_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_EchoService_Stream_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("POST", pattern_EchoService_Heartbeats_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(ctx) - defer cancel() - if cn, ok := w.(http.CloseNotifier); ok { - go func(done <-chan struct{}, closed <-chan bool) { - select { - case <-done: - case <-closed: - cancel() - } - }(ctx.Done(), cn.CloseNotify()) - } - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_EchoService_Heartbeats_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_EchoService_Heartbeats_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - - }) - - return nil -} - -var ( - pattern_EchoService_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"echo"}, "")) - - pattern_EchoService_Stream_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"echo"}, "")) - - pattern_EchoService_Heartbeats_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"heartbeats"}, "")) -) - -var ( - forward_EchoService_Echo_0 = runtime.ForwardResponseStream - - forward_EchoService_Stream_0 = runtime.ForwardResponseStream - - forward_EchoService_Heartbeats_0 = runtime.ForwardResponseStream -) diff --git a/echoserver/echoserver.proto b/echoserver/echoserver.proto deleted file mode 100644 index 7242a86..0000000 --- a/echoserver/echoserver.proto +++ /dev/null @@ -1,37 +0,0 @@ -syntax = "proto3"; -package echoserver; - -import "google/api/annotations.proto"; - -message EchoRequest { - string message = 1; -} - -message EchoResponse { - string message = 1; -} - -message Heartbeat { - enum Status { - UNKNOWN = 0; - OK = 1; - } - Status status = 1; -} - -message Empty {} - -service EchoService { - rpc Echo(stream EchoRequest) returns (stream EchoResponse) { - option (google.api.http) = { - post: "/echo" - body: "*" - }; - } - rpc Stream(Empty) returns (stream EchoResponse) { - option (google.api.http) = {get: "/echo"}; - } - rpc Heartbeats(stream Empty) returns (stream Heartbeat) { - option (google.api.http) = {post: "/heartbeats"}; - } -} diff --git a/echoserver/Makefile b/ws/cmd similarity index 53% rename from echoserver/Makefile rename to ws/cmd index 4e0b366..06f8694 100644 --- a/echoserver/Makefile +++ b/ws/cmd @@ -1,4 +1 @@ protoc -I/usr/local/include -I. -I${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --go_out=plugins=grpc:. --grpc-gateway_out=logtostderr=true:. echoserver/echoserver.proto - -protoc -I/usr/local/include -I. -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis - -I grpc/ grpc/grpc.proto --go_out=plugins=grpc:grpc diff --git a/ws/ws.proto b/ws/ws.proto new file mode 100644 index 0000000..065367b --- /dev/null +++ b/ws/ws.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; +package echoserver; + +import "google/api/annotations.proto"; + +message WSRequest { + string msgType = 1; + string userId = 2; + string msg = 3; +} + +message WSResponse { + string msgType = 1; + string userId = 2; + string msg = 3; +} + +service WebSocketService { + rpc Test(stream WSRequest) returns (stream WSResponse) { + option (google.api.http) = { + get: "/ws" + }; + } +}