diff --git a/api/calcapi.proto b/api/calcapi.proto index 699494ed..8598b12a 100644 --- a/api/calcapi.proto +++ b/api/calcapi.proto @@ -224,6 +224,7 @@ message SIO { message Input { string room = 1; Peer peer = 2; + int32 max_log_entries = 3; } message Output { repeated Peer peers = 1; diff --git a/cmd/calcbiz/main.go b/cmd/calcbiz/main.go index 08939cc0..3e177484 100644 --- a/cmd/calcbiz/main.go +++ b/cmd/calcbiz/main.go @@ -244,8 +244,9 @@ func startHTTPServer(ctx context.Context, opts *serverOptions) error { defer sio.Close() zap.L().Info("starting HTTP server", zap.String("bind", opts.HTTPBind)) - m := wsproxy.WebsocketProxy(r) // FIXME: with logger - return http.ListenAndServe(opts.HTTPBind, m) + var h http.Handler = r + h = wsproxy.WebsocketProxy(h) // FIXME: with logger + return http.ListenAndServe(opts.HTTPBind, h) } func startGRPCServer(ctx context.Context, opts *serverOptions) error { diff --git a/gen.sum b/gen.sum index 14a7d2f5..8823aecd 100644 --- a/gen.sum +++ b/gen.sum @@ -1,5 +1,5 @@ +2a6baa17ee56202e26ddfa73d57bc489403c07f2 ./api/calcapi.proto 431b63cd908588e398bbb94d1e642e585441099c ./api/dashboard.proto -47116fdc07405fe179dde05f858ac45e88647cfd ./api/calcapi.proto 5c613daf5318661d709f8766163ef986d885b72d Makefile a0415fc5002d339337b03fe97801376ff3be3bbd ./api/crew.proto ffa8325482af5c58dd816e9404f0226db0a1d7de ./api/soundcloud.proto diff --git a/go.mod b/go.mod index 5817bb75..eb071c58 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/gogo/protobuf v1.3.1 github.com/golang/protobuf v1.3.2 github.com/google/uuid v1.1.1 // indirect - github.com/googollee/go-engine.io v1.4.2 // indirect + github.com/googollee/go-engine.io v1.4.2 github.com/googollee/go-socket.io v1.4.2 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect github.com/gorilla/mux v1.7.3 diff --git a/pkg/calcapi/calcapi.pb.go b/pkg/calcapi/calcapi.pb.go index 165e48eb..f6a836eb 100644 --- a/pkg/calcapi/calcapi.pb.go +++ b/pkg/calcapi/calcapi.pb.go @@ -3530,8 +3530,9 @@ func (m *SIO_Join) XXX_DiscardUnknown() { var xxx_messageInfo_SIO_Join proto.InternalMessageInfo type SIO_Join_Input struct { - Room string `protobuf:"bytes,1,opt,name=room,proto3" json:"room,omitempty"` - Peer *SIO_Peer `protobuf:"bytes,2,opt,name=peer,proto3" json:"peer,omitempty"` + Room string `protobuf:"bytes,1,opt,name=room,proto3" json:"room,omitempty"` + Peer *SIO_Peer `protobuf:"bytes,2,opt,name=peer,proto3" json:"peer,omitempty"` + MaxLogEntries int32 `protobuf:"varint,3,opt,name=max_log_entries,json=maxLogEntries,proto3" json:"max_log_entries,omitempty"` } func (m *SIO_Join_Input) Reset() { *m = SIO_Join_Input{} } @@ -3581,6 +3582,13 @@ func (m *SIO_Join_Input) GetPeer() *SIO_Peer { return nil } +func (m *SIO_Join_Input) GetMaxLogEntries() int32 { + if m != nil { + return m.MaxLogEntries + } + return 0 +} + type SIO_Join_Output struct { Peers []*SIO_Peer `protobuf:"bytes,1,rep,name=peers,proto3" json:"peers,omitempty"` } @@ -4359,151 +4367,153 @@ func init() { func init() { proto.RegisterFile("calcapi.proto", fileDescriptor_b4e0a0c9e1471050) } var fileDescriptor_b4e0a0c9e1471050 = []byte{ - // 2302 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4d, 0x6f, 0x1c, 0x49, - 0x19, 0x4e, 0x8f, 0x67, 0x3c, 0x76, 0x25, 0xf1, 0x47, 0xc5, 0x49, 0x9c, 0x8e, 0x63, 0x3b, 0x9d, - 0xac, 0xe3, 0x78, 0x35, 0x33, 0x21, 0x81, 0x55, 0xc8, 0x22, 0x44, 0xe2, 0x78, 0x83, 0x37, 0xeb, - 0x4d, 0xb6, 0xc7, 0x0b, 0x1b, 0x38, 0x0c, 0xed, 0xee, 0x9a, 0x99, 0x62, 0xba, 0xbb, 0x9a, 0xea, - 0x1a, 0x27, 0x93, 0xc8, 0x12, 0x5a, 0x09, 0x21, 0x0e, 0x2b, 0x36, 0x82, 0x0b, 0x88, 0x9f, 0xc0, - 0x85, 0x13, 0xff, 0x00, 0xed, 0x71, 0x25, 0x2e, 0x70, 0x43, 0x09, 0x77, 0xf8, 0x03, 0x48, 0xa8, - 0x3e, 0xfa, 0x63, 0xa6, 0xbb, 0xc7, 0x13, 0xd8, 0xbd, 0x55, 0xd5, 0xfb, 0xf4, 0xf3, 0x3c, 0xf5, - 0xd6, 0xe7, 0xd4, 0x80, 0xd3, 0xb6, 0xe5, 0xda, 0x56, 0x80, 0xeb, 0x01, 0x25, 0x8c, 0xc0, 0x79, - 0x5e, 0x3d, 0xc0, 0xcf, 0xeb, 0xaa, 0x59, 0x5f, 0xe9, 0x10, 0xd2, 0x71, 0x51, 0xc3, 0x0a, 0x70, - 0xc3, 0xf2, 0x7d, 0xc2, 0x2c, 0x86, 0x89, 0x1f, 0x4a, 0xb8, 0x5e, 0xeb, 0x60, 0xd6, 0xed, 0x1f, - 0xd4, 0x6d, 0xe2, 0x35, 0x3a, 0xa4, 0x43, 0x1a, 0xa2, 0xf9, 0xa0, 0xdf, 0x16, 0x35, 0x51, 0x11, - 0x25, 0x05, 0x07, 0x36, 0x45, 0x4f, 0x55, 0x79, 0xde, 0xb1, 0xc2, 0xee, 0x01, 0xb1, 0xa8, 0xa3, - 0x1a, 0x16, 0x42, 0xd2, 0xf7, 0x1d, 0xdb, 0x25, 0x7d, 0xd5, 0x62, 0x6c, 0x03, 0xb0, 0x63, 0x77, - 0x49, 0x93, 0x51, 0x64, 0x79, 0xfa, 0x05, 0x50, 0xd9, 0xf5, 0x83, 0x3e, 0x83, 0x0b, 0x60, 0xca, - 0x0b, 0x3b, 0xcb, 0xda, 0xba, 0xb6, 0x39, 0x6b, 0xf2, 0xa2, 0xae, 0x83, 0xe9, 0x47, 0x7d, 0x96, - 0x1b, 0x33, 0xbe, 0x05, 0xe6, 0xf6, 0x51, 0xc8, 0x4c, 0x64, 0x39, 0x8a, 0xa8, 0xaa, 0x88, 0xc6, - 0x7e, 0xf6, 0x04, 0x80, 0x6d, 0xd2, 0xf7, 0x19, 0xa2, 0xbb, 0xbe, 0xad, 0xbf, 0x9d, 0xd2, 0xee, - 0xa1, 0x41, 0x04, 0xec, 0xa1, 0x01, 0x6f, 0xe9, 0x58, 0xc1, 0x72, 0x69, 0x5d, 0xdb, 0xd4, 0x4c, - 0x5e, 0xd4, 0x57, 0x63, 0xda, 0x25, 0x50, 0x39, 0xb4, 0xdc, 0x3e, 0x52, 0x51, 0x59, 0x31, 0x1c, - 0xb0, 0xf8, 0x61, 0xdf, 0x3b, 0x40, 0xb4, 0x89, 0xd8, 0x6e, 0xfb, 0x1e, 0xee, 0x74, 0x10, 0xd5, - 0x1b, 0xc5, 0x0a, 0xb9, 0x2c, 0xc7, 0xaa, 0x7c, 0x08, 0x16, 0x1f, 0xa2, 0xc1, 0x0f, 0x78, 0xb9, - 0xc9, 0x28, 0xf6, 0x3b, 0x4d, 0xc4, 0x26, 0x56, 0x99, 0x8d, 0x54, 0x66, 0x22, 0x95, 0x2c, 0xdf, - 0x03, 0xc4, 0x86, 0xc6, 0x64, 0x98, 0xaf, 0xc8, 0x5f, 0xc4, 0x6c, 0xec, 0x81, 0x85, 0x88, 0xef, - 0x3d, 0x97, 0x58, 0xec, 0x4d, 0xec, 0x69, 0x59, 0x7b, 0xa3, 0x74, 0xff, 0x9b, 0xbb, 0x38, 0x7b, - 0xfb, 0x60, 0xf6, 0x7e, 0x34, 0x3f, 0x93, 0x09, 0xf3, 0xdd, 0xf8, 0xab, 0x6f, 0x82, 0x2a, 0xf2, - 0x19, 0xc5, 0x28, 0x14, 0xac, 0x27, 0x6f, 0xea, 0xf5, 0x68, 0xe5, 0x24, 0xf3, 0x7a, 0x47, 0x22, - 0xcc, 0x08, 0x6a, 0x3c, 0x06, 0x95, 0xef, 0x5b, 0x76, 0xef, 0xf9, 0x57, 0xc7, 0x78, 0x17, 0x94, - 0xb7, 0x29, 0x7a, 0x9a, 0x10, 0xde, 0x88, 0x09, 0x37, 0x40, 0x99, 0x2f, 0x37, 0xc5, 0x06, 0x63, - 0x36, 0xb1, 0x06, 0xf9, 0x47, 0xa6, 0x88, 0x1b, 0x0f, 0xc1, 0xa9, 0x66, 0xbc, 0xf2, 0xf6, 0x50, - 0x42, 0x75, 0x33, 0xa6, 0xda, 0x04, 0x25, 0x0f, 0x29, 0xa2, 0xe5, 0x98, 0x28, 0xb5, 0x5e, 0x3f, - 0x0e, 0x11, 0x35, 0x4b, 0x1e, 0x32, 0x10, 0x38, 0x93, 0x90, 0x3d, 0x76, 0xad, 0x81, 0x8b, 0x43, - 0x16, 0x26, 0x9c, 0x3b, 0x31, 0xe7, 0xbb, 0x60, 0x36, 0x88, 0xe2, 0x8a, 0xfa, 0x52, 0x1e, 0x75, - 0x4c, 0x62, 0x26, 0x78, 0xe3, 0x53, 0x0d, 0xc0, 0xac, 0x8e, 0xbe, 0x19, 0x0d, 0xf8, 0x1a, 0x38, - 0x19, 0x81, 0x5b, 0xd8, 0x11, 0xf4, 0x65, 0x13, 0x44, 0x4d, 0xbb, 0x8e, 0x7e, 0x2f, 0xf6, 0x71, - 0x1b, 0xcc, 0x44, 0xed, 0xca, 0xc6, 0xca, 0x38, 0x1b, 0x66, 0x8c, 0x36, 0x9e, 0x80, 0x85, 0xc4, - 0xc3, 0x3e, 0xb5, 0xec, 0x5e, 0xaa, 0xa3, 0xdf, 0x89, 0x05, 0x6e, 0x82, 0x69, 0x26, 0x82, 0x99, - 0x71, 0x4d, 0xd1, 0xcb, 0xcf, 0x4d, 0x85, 0x34, 0x02, 0x30, 0x3f, 0x42, 0xad, 0x1b, 0x51, 0xdf, - 0x2e, 0x80, 0x19, 0x81, 0x4a, 0x3a, 0x56, 0x15, 0xf5, 0x5d, 0x47, 0xff, 0x76, 0x2c, 0xda, 0x00, - 0x15, 0xd1, 0xa8, 0x34, 0x2f, 0x14, 0x6a, 0x9a, 0x12, 0x67, 0xfc, 0x45, 0x03, 0xd5, 0x3d, 0xc4, - 0x28, 0xb6, 0x53, 0x9d, 0xf8, 0x93, 0x96, 0x9a, 0x4d, 0xf3, 0x21, 0xdf, 0xfb, 0xed, 0xd6, 0x01, - 0x79, 0xd6, 0x0a, 0xf1, 0x73, 0x39, 0x1f, 0x2a, 0xe6, 0x69, 0xd9, 0x7c, 0x8f, 0x3c, 0x6b, 0xe2, - 0xe7, 0x08, 0x6e, 0x81, 0xc5, 0x10, 0xd1, 0x43, 0x44, 0x5b, 0x21, 0xb3, 0x28, 0x6b, 0x31, 0xec, - 0x45, 0x0b, 0x7f, 0x5e, 0x06, 0x9a, 0xbc, 0x7d, 0x1f, 0x7b, 0x08, 0xd6, 0xc1, 0x19, 0x85, 0xb5, - 0xfb, 0x94, 0x22, 0x5f, 0xa1, 0xa7, 0x04, 0x5a, 0xd1, 0x6c, 0xcb, 0x88, 0xc0, 0x5f, 0x01, 0xa7, - 0x15, 0xbe, 0x1f, 0x08, 0x64, 0x59, 0x20, 0x4f, 0xc9, 0xc6, 0x8f, 0x45, 0x9b, 0x51, 0x03, 0xe5, - 0xc7, 0xd8, 0xef, 0x24, 0x9d, 0x58, 0x89, 0xfb, 0x00, 0x41, 0x39, 0x20, 0x7e, 0xb4, 0xcd, 0x8b, - 0xb2, 0xf1, 0x3d, 0x50, 0x7d, 0x48, 0x07, 0x01, 0x23, 0xa1, 0x7e, 0x31, 0xca, 0x30, 0x04, 0xe5, - 0x36, 0x25, 0x5e, 0x84, 0xe3, 0x65, 0x7d, 0x39, 0x66, 0x99, 0x03, 0x25, 0x46, 0x54, 0xac, 0x24, - 0x4f, 0xa9, 0xfd, 0x60, 0x40, 0x76, 0x7c, 0x62, 0x3b, 0x48, 0x90, 0x04, 0x7d, 0x5f, 0x92, 0x10, - 0x9a, 0x90, 0x10, 0xaa, 0x48, 0x02, 0x96, 0x43, 0xf2, 0x67, 0x0d, 0x00, 0x79, 0x28, 0x60, 0xbf, - 0x4d, 0xf4, 0xb5, 0xc8, 0xca, 0x39, 0x30, 0xed, 0x8b, 0x66, 0x81, 0x2d, 0x99, 0xaa, 0xa6, 0xff, - 0x32, 0x19, 0x99, 0x6d, 0x50, 0x69, 0x5b, 0xb6, 0x58, 0x44, 0x53, 0x9b, 0x27, 0x6f, 0xd6, 0xea, - 0x23, 0x47, 0x78, 0x3d, 0xe1, 0xad, 0xcb, 0x4f, 0xea, 0xef, 0x71, 0x3c, 0xdf, 0x4b, 0x06, 0xa6, - 0xfc, 0x56, 0xbf, 0x0d, 0x40, 0xd2, 0x38, 0xe9, 0xe9, 0x70, 0xa7, 0x74, 0x5b, 0x33, 0x6e, 0x81, - 0x99, 0x3d, 0x82, 0x7f, 0x6a, 0x61, 0x2f, 0xb5, 0x75, 0x0c, 0x6d, 0xaf, 0x3d, 0xdc, 0x6e, 0x4b, - 0x77, 0xb3, 0xa6, 0xac, 0xf0, 0x41, 0xfa, 0x21, 0x61, 0x4e, 0xc1, 0x20, 0x3d, 0x25, 0xd4, 0x89, - 0xf2, 0xc6, 0xcb, 0xc6, 0x3b, 0xe0, 0xf4, 0x5d, 0x97, 0x21, 0xea, 0x5b, 0x0c, 0x7d, 0x40, 0x3a, - 0xa4, 0x68, 0x70, 0x2d, 0xd6, 0x8d, 0x07, 0xd7, 0x62, 0x5d, 0x63, 0x03, 0x2c, 0x36, 0x03, 0x8a, - 0x2c, 0x27, 0xec, 0x62, 0xca, 0x4c, 0xcb, 0x77, 0x48, 0xea, 0xf8, 0x4f, 0x0e, 0x8f, 0x2b, 0x60, - 0x2e, 0x85, 0xbb, 0xeb, 0xba, 0x79, 0xa0, 0xdf, 0x57, 0x00, 0x30, 0x91, 0x8d, 0x18, 0xb3, 0x18, - 0xa1, 0xfa, 0x4b, 0x2d, 0x35, 0x5d, 0x42, 0x84, 0xa4, 0xe3, 0x29, 0x53, 0x94, 0xe1, 0x75, 0xb0, - 0xe0, 0x59, 0xd8, 0x6f, 0x61, 0xbf, 0x43, 0x91, 0x83, 0x91, 0xcf, 0x42, 0x91, 0xba, 0xb2, 0x39, - 0xcf, 0xdb, 0x77, 0x93, 0x66, 0x78, 0x0b, 0x9c, 0x0d, 0x91, 0x4d, 0x7c, 0xc7, 0xa2, 0x83, 0x21, - 0xfc, 0x94, 0xc0, 0x2f, 0xc5, 0xc1, 0xf4, 0x47, 0x4b, 0xa0, 0x12, 0x32, 0x14, 0x84, 0x62, 0x09, - 0x94, 0x4d, 0x59, 0xd1, 0xff, 0x58, 0x4a, 0xe7, 0x9d, 0x61, 0xe6, 0x22, 0x95, 0x0f, 0x59, 0xe1, - 0xd3, 0x29, 0x40, 0x24, 0x70, 0x91, 0x32, 0xa3, 0x6a, 0x50, 0x07, 0x33, 0x9e, 0x45, 0x7b, 0x0e, - 0x79, 0xea, 0xab, 0xe5, 0x17, 0xd7, 0xd3, 0x52, 0x62, 0x04, 0x45, 0x05, 0x7e, 0x94, 0xd3, 0xc1, - 0x8a, 0x98, 0x80, 0x1b, 0x99, 0x09, 0x98, 0x64, 0xad, 0x9e, 0xf4, 0x21, 0x9b, 0x88, 0x1f, 0x17, - 0x25, 0x62, 0xfa, 0x8d, 0x78, 0xf3, 0x13, 0x16, 0x0d, 0x52, 0x35, 0x19, 0x24, 0xfd, 0x0b, 0x0d, - 0x80, 0x04, 0xc3, 0x21, 0xbe, 0xe5, 0x45, 0x19, 0x13, 0x65, 0x9e, 0x98, 0x9f, 0xf5, 0x2d, 0x9f, - 0x61, 0x36, 0x50, 0x53, 0x3f, 0xae, 0xf3, 0x64, 0x7a, 0x88, 0x75, 0x89, 0xa3, 0x52, 0xa6, 0x6a, - 0xbc, 0xbd, 0x83, 0x7c, 0x07, 0x51, 0xb5, 0x3f, 0xa9, 0x9a, 0x48, 0x72, 0xdf, 0x65, 0x98, 0xa7, - 0xbf, 0xb2, 0xae, 0x6d, 0xce, 0x98, 0x71, 0x9d, 0x6b, 0xf7, 0xb0, 0xef, 0x2c, 0x4f, 0x4b, 0x6d, - 0x5e, 0xe6, 0x5b, 0x29, 0xf7, 0xd0, 0xb2, 0x7c, 0xa7, 0x15, 0x9b, 0xa8, 0xca, 0xad, 0x94, 0x07, - 0xee, 0xfa, 0xce, 0x47, 0xaa, 0xd9, 0xf8, 0xcf, 0x34, 0x98, 0x6a, 0xee, 0x3e, 0xd2, 0xff, 0xae, - 0x81, 0xf2, 0xfb, 0x04, 0xfb, 0xfa, 0xfb, 0xa9, 0xd9, 0x49, 0x49, 0xb2, 0x99, 0xf1, 0x32, 0xac, - 0x81, 0x72, 0x80, 0x10, 0x15, 0x3d, 0x4a, 0x1f, 0x0e, 0x51, 0x62, 0x9b, 0xbb, 0x8f, 0xea, 0x8f, - 0x11, 0xa2, 0xa6, 0x80, 0x0d, 0x1f, 0x2b, 0xbc, 0x25, 0xda, 0x6b, 0xc6, 0x7c, 0x29, 0x71, 0xdc, - 0xc6, 0xce, 0xa1, 0x4a, 0xee, 0xff, 0x6b, 0xe3, 0xdf, 0x1a, 0x98, 0xbd, 0x47, 0x89, 0xe5, 0xd8, - 0x56, 0xc8, 0xf4, 0x07, 0xe3, 0x3a, 0xb8, 0x25, 0xef, 0xf3, 0xa5, 0x91, 0x1b, 0x4b, 0x9a, 0x78, - 0x2f, 0xec, 0xc8, 0x1f, 0x0f, 0xf1, 0x0a, 0xd7, 0x7f, 0xad, 0x8d, 0x73, 0xfb, 0x06, 0x9c, 0x71, - 0xcf, 0xa6, 0x26, 0xea, 0x19, 0x3c, 0x0f, 0xaa, 0x38, 0x6c, 0xb9, 0xf8, 0x50, 0x1e, 0x69, 0x33, - 0xe6, 0x34, 0x0e, 0x3f, 0xc0, 0x87, 0x48, 0xbf, 0x06, 0x2a, 0x26, 0x21, 0x5e, 0x38, 0xbc, 0xa1, - 0x72, 0x3b, 0xf1, 0x86, 0x2a, 0x2a, 0xfa, 0x27, 0x00, 0xdc, 0xc7, 0xa1, 0x4d, 0x7c, 0x1f, 0xd9, - 0xec, 0x2b, 0xcd, 0xfa, 0x37, 0xc0, 0xd4, 0x5e, 0xd8, 0xe1, 0x4c, 0x0c, 0x3d, 0x63, 0x11, 0x13, - 0x2f, 0xa7, 0x0e, 0xa7, 0x92, 0x58, 0x55, 0xd1, 0xe1, 0xf4, 0x2e, 0xa8, 0xec, 0x50, 0x4a, 0x28, - 0xbf, 0xaa, 0xe0, 0xb0, 0x85, 0x78, 0x59, 0x7c, 0x38, 0x63, 0x56, 0x71, 0x28, 0x43, 0xe7, 0x41, - 0x15, 0x51, 0xda, 0x8a, 0x32, 0x3a, 0x6b, 0x4e, 0x23, 0x4a, 0xf7, 0xc2, 0x8e, 0xfe, 0x04, 0x94, - 0xb9, 0x7a, 0xee, 0x6a, 0x5c, 0x02, 0x15, 0x9b, 0xb8, 0x84, 0x46, 0xa7, 0x90, 0xa8, 0xc0, 0x6b, - 0x60, 0xbe, 0x6d, 0x1d, 0x12, 0x8a, 0x19, 0x6a, 0x29, 0x3f, 0x53, 0xe2, 0x6a, 0x32, 0x17, 0x35, - 0xcb, 0x13, 0x50, 0x7f, 0x02, 0xaa, 0xdb, 0xc4, 0x17, 0xd6, 0xa3, 0x24, 0x68, 0x93, 0x0d, 0xd0, - 0x1a, 0x38, 0xe9, 0x93, 0x96, 0x87, 0x98, 0xe5, 0x58, 0xcc, 0x12, 0xf2, 0x33, 0x26, 0xf0, 0xc9, - 0x9e, 0x6a, 0xb9, 0xf9, 0x2f, 0x1d, 0x54, 0x9b, 0x88, 0x1e, 0x62, 0x1b, 0x41, 0x0a, 0xe6, 0xd4, - 0x95, 0x62, 0xc7, 0xb7, 0x79, 0x01, 0xae, 0x66, 0xf8, 0x15, 0xa0, 0x2e, 0x0f, 0x99, 0xb5, 0xc2, - 0xb8, 0x3a, 0x7b, 0xd6, 0x3e, 0xfd, 0xeb, 0x3f, 0x7f, 0x53, 0xba, 0x60, 0x2c, 0x89, 0xdf, 0xe1, - 0x3d, 0x19, 0x6c, 0x20, 0x49, 0x7f, 0x47, 0xdb, 0x4a, 0x69, 0xde, 0x47, 0x5f, 0xab, 0xa6, 0x83, - 0x62, 0x4d, 0x9c, 0xbe, 0xf8, 0xc0, 0xcb, 0x19, 0xbe, 0x24, 0x58, 0x17, 0x57, 0x22, 0xdd, 0x18, - 0x07, 0x91, 0x17, 0x23, 0x63, 0x49, 0xa8, 0xce, 0x19, 0xb3, 0x42, 0x95, 0x05, 0x03, 0xc2, 0xa5, - 0xf6, 0xe5, 0xa5, 0x0e, 0x5e, 0xcc, 0x30, 0xf0, 0x66, 0xd5, 0xa3, 0x95, 0xfc, 0xa0, 0xea, 0xce, - 0xa2, 0x20, 0x3e, 0x09, 0x25, 0x71, 0xc0, 0xd9, 0xba, 0xa9, 0x1f, 0x79, 0x70, 0x3d, 0xf3, 0x75, - 0x1c, 0x53, 0xfc, 0x97, 0xc7, 0x20, 0x94, 0xc8, 0x39, 0x21, 0xb2, 0x00, 0xe7, 0x84, 0x48, 0xfc, - 0xbb, 0x0d, 0x7e, 0xa2, 0x7e, 0xf8, 0xc1, 0xac, 0x47, 0xd1, 0xae, 0x14, 0x2e, 0x15, 0x44, 0x15, - 0x3b, 0x14, 0xec, 0xa7, 0x20, 0x10, 0xec, 0x5d, 0x41, 0xb8, 0x2f, 0x7f, 0x00, 0xe6, 0x64, 0x86, - 0x37, 0x17, 0x66, 0x46, 0x04, 0x73, 0x33, 0xc3, 0x7f, 0x13, 0xc2, 0x7e, 0xfa, 0x36, 0x9a, 0x33, - 0xb4, 0xa9, 0x2b, 0xa5, 0x54, 0x30, 0x8e, 0xbf, 0x75, 0x1a, 0xeb, 0x42, 0x47, 0x87, 0xcb, 0x42, - 0xc7, 0x8f, 0xe3, 0x8d, 0x17, 0xb2, 0x7c, 0x04, 0xdd, 0xf4, 0x0d, 0x2b, 0x47, 0x76, 0xe8, 0xc0, - 0xcf, 0x97, 0x4d, 0x41, 0x94, 0xec, 0x79, 0x21, 0xbb, 0x08, 0xe7, 0x85, 0x2c, 0x4d, 0xf8, 0x9d, - 0xe4, 0xe6, 0x0a, 0xb3, 0xab, 0x21, 0x0a, 0x29, 0xa5, 0xf5, 0x62, 0x80, 0xd2, 0x39, 0x2b, 0x74, - 0xe6, 0xe1, 0x69, 0xa1, 0xe3, 0x45, 0xcc, 0xbf, 0xd2, 0x72, 0x2e, 0xa1, 0x70, 0x33, 0xbb, 0xe3, - 0x8c, 0x62, 0x94, 0xf0, 0xf5, 0x09, 0x90, 0xc3, 0x2b, 0x16, 0x9e, 0x17, 0x0e, 0xc2, 0x04, 0xd6, - 0xa0, 0x52, 0xf5, 0x68, 0xf4, 0x9e, 0x0b, 0xdf, 0x1a, 0xc7, 0x7e, 0xd7, 0x75, 0x95, 0x89, 0x8d, - 0xe3, 0x60, 0xca, 0xc1, 0x8a, 0x70, 0x70, 0x0e, 0x2e, 0x65, 0x1c, 0x58, 0xae, 0xcb, 0xe7, 0x2a, - 0xbf, 0xf5, 0xe7, 0xcc, 0x55, 0xde, 0x5c, 0x38, 0x57, 0x45, 0x30, 0x77, 0xae, 0x3e, 0xe5, 0x6c, - 0x83, 0x91, 0x1f, 0x07, 0xf0, 0x6a, 0x86, 0x61, 0x28, 0xae, 0x74, 0xde, 0x3a, 0x06, 0xa5, 0x04, - 0x2f, 0x0a, 0xc1, 0xb3, 0xf0, 0x8c, 0x7c, 0x01, 0x8d, 0x20, 0x35, 0x97, 0x2b, 0xf5, 0x87, 0x9f, - 0x4e, 0xe0, 0x95, 0x6c, 0x9a, 0x52, 0x61, 0x25, 0x7c, 0x75, 0x3c, 0x48, 0xe9, 0xea, 0x42, 0x77, - 0x09, 0x42, 0x99, 0xc9, 0x18, 0xd1, 0xf0, 0x10, 0x7c, 0xa9, 0xe5, 0xbe, 0xb2, 0xc0, 0xad, 0x31, - 0xcc, 0x31, 0x4a, 0xb9, 0x78, 0x7b, 0x22, 0xac, 0x32, 0x73, 0x59, 0x98, 0xb9, 0x08, 0x2f, 0x8c, - 0x9a, 0x89, 0x5f, 0x64, 0xe0, 0x1f, 0x72, 0x5f, 0x64, 0xe0, 0xf5, 0x09, 0x64, 0x94, 0xa3, 0x49, - 0xdc, 0x47, 0x86, 0x1a, 0xc2, 0xd0, 0x75, 0x78, 0xad, 0xd0, 0x50, 0xe3, 0x45, 0xea, 0x01, 0xe8, - 0x08, 0xfe, 0x42, 0xcb, 0x3e, 0xd6, 0xc0, 0x6b, 0x63, 0x14, 0x25, 0x44, 0x59, 0xdb, 0x3c, 0x1e, - 0xa8, 0x8c, 0xad, 0x0a, 0x63, 0xcb, 0xf0, 0xdc, 0xa8, 0x31, 0xf9, 0xb0, 0x03, 0x3f, 0xd3, 0x32, - 0x2f, 0x3b, 0x70, 0xe3, 0x38, 0x76, 0xe5, 0xe2, 0x58, 0xbb, 0x91, 0x89, 0xeb, 0xc2, 0xc4, 0x15, - 0x78, 0x39, 0xdf, 0x44, 0xe3, 0x45, 0xf4, 0x7e, 0x74, 0x04, 0x7f, 0x12, 0xbf, 0xfa, 0xe4, 0x5c, - 0x18, 0x54, 0xa4, 0xf0, 0xc2, 0x10, 0xc5, 0x95, 0xac, 0x3a, 0xba, 0xe1, 0x29, 0xb9, 0x01, 0x2a, - 0xda, 0x30, 0xfd, 0x90, 0x9e, 0xb3, 0xa7, 0x27, 0xc1, 0xc2, 0x3d, 0x3d, 0x05, 0xc9, 0x4d, 0xb3, - 0x2d, 0xe3, 0x35, 0xec, 0xdb, 0x8d, 0x17, 0x3d, 0x34, 0x38, 0x82, 0xbf, 0xd3, 0x72, 0xde, 0xd8, - 0x73, 0x36, 0xdd, 0x0c, 0xa6, 0x70, 0xd3, 0xcd, 0x22, 0x73, 0xa7, 0xa2, 0x3c, 0xc9, 0x6a, 0x21, - 0x62, 0x35, 0xdc, 0xae, 0x1d, 0x08, 0xa4, 0xf4, 0xd4, 0x78, 0x21, 0xde, 0x4c, 0x8e, 0xe0, 0x6f, - 0xb5, 0x9c, 0x97, 0xf9, 0x1c, 0x6f, 0x19, 0x4c, 0xa1, 0xb7, 0x2c, 0x52, 0x79, 0xdb, 0x12, 0xde, - 0xae, 0x1a, 0x6b, 0xf2, 0x0a, 0x87, 0x06, 0x35, 0xe1, 0xa1, 0x16, 0x0a, 0x20, 0x77, 0x29, 0xbd, - 0xf1, 0x2b, 0xd6, 0x4b, 0x2d, 0xe7, 0x81, 0xff, 0x58, 0x5b, 0x0f, 0x26, 0xb6, 0xf5, 0x20, 0xb1, - 0x75, 0x4d, 0xd8, 0xba, 0x0c, 0x0b, 0x6c, 0x75, 0x22, 0x5b, 0xf0, 0x73, 0x2d, 0xfb, 0x27, 0x41, - 0xce, 0xaa, 0x1d, 0x85, 0x14, 0xae, 0xda, 0x0c, 0x70, 0x78, 0xc1, 0x18, 0xab, 0x23, 0x86, 0xda, - 0x1c, 0x37, 0x9c, 0xa6, 0xcf, 0xb4, 0xec, 0x1f, 0x0d, 0xc7, 0x59, 0x7a, 0x30, 0xa9, 0xa5, 0x54, - 0x8e, 0x36, 0x84, 0xa5, 0x75, 0x98, 0x6f, 0x29, 0x49, 0x11, 0x4b, 0xff, 0x47, 0x96, 0xb3, 0xbc, - 0x92, 0x60, 0xe1, 0xf2, 0x4a, 0x41, 0x86, 0x0f, 0x3d, 0x63, 0x41, 0x88, 0x23, 0xbb, 0x4b, 0xf8, - 0xd8, 0x20, 0xcb, 0xbb, 0xa3, 0x6d, 0x6d, 0x6a, 0x37, 0x34, 0xf8, 0x73, 0x6d, 0xf4, 0x5f, 0xb5, - 0x9c, 0x9b, 0xc4, 0x30, 0xa0, 0xf0, 0x26, 0x31, 0x02, 0x53, 0x16, 0x2e, 0x09, 0x0b, 0xe7, 0xe1, - 0x59, 0xf9, 0x3b, 0x00, 0x85, 0xac, 0xc6, 0x2f, 0x13, 0xca, 0xc7, 0x0d, 0xed, 0xde, 0x3b, 0x5f, - 0xbc, 0x5a, 0xd5, 0xbe, 0x7c, 0xb5, 0xaa, 0xfd, 0xe3, 0xd5, 0xaa, 0xf6, 0xf9, 0xeb, 0xd5, 0x13, - 0x5f, 0xbe, 0x5e, 0x3d, 0xf1, 0xb7, 0xd7, 0xab, 0x27, 0x7e, 0xb4, 0xd2, 0x77, 0x19, 0x45, 0x75, - 0x0f, 0x35, 0x94, 0x54, 0x23, 0xe8, 0x75, 0x1a, 0x4a, 0xee, 0x60, 0x5a, 0xfc, 0xb7, 0x78, 0xeb, - 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x2b, 0x1e, 0xeb, 0xf9, 0x1c, 0x00, 0x00, + // 2325 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4d, 0x73, 0xdc, 0x48, + 0xfd, 0x8e, 0xc6, 0x33, 0x1e, 0xbb, 0x93, 0xf8, 0xa5, 0xe3, 0x24, 0x8e, 0xe2, 0xd8, 0x8e, 0x92, + 0x75, 0x1c, 0x6f, 0xcd, 0x4c, 0xfe, 0xc9, 0x9f, 0xad, 0x90, 0xa5, 0x28, 0x12, 0xc7, 0x1b, 0xbc, + 0x89, 0x37, 0x59, 0x8d, 0x17, 0x36, 0x70, 0x18, 0xda, 0x52, 0x5b, 0x6e, 0x2c, 0xa9, 0x45, 0xab, + 0xc7, 0xc9, 0x24, 0xe5, 0x2a, 0xd8, 0x2a, 0x8a, 0xe2, 0xb0, 0xc5, 0xa6, 0xe0, 0x02, 0xc5, 0x95, + 0x1b, 0x17, 0x4e, 0x7c, 0x03, 0x6a, 0x8f, 0x5b, 0xc5, 0x85, 0x23, 0x95, 0x70, 0x87, 0x8f, 0x40, + 0xf5, 0x8b, 0x5e, 0x66, 0xa4, 0x19, 0x3b, 0xb0, 0xdc, 0xba, 0xfb, 0xf7, 0xe8, 0x79, 0x1e, 0xfd, + 0xfa, 0x55, 0x2d, 0x70, 0xda, 0x41, 0xbe, 0x83, 0x22, 0xd2, 0x8c, 0x18, 0xe5, 0x14, 0x4e, 0x8b, + 0xea, 0x0e, 0x79, 0xd1, 0xd4, 0xcd, 0xe6, 0x82, 0x47, 0xa9, 0xe7, 0xe3, 0x16, 0x8a, 0x48, 0x0b, + 0x85, 0x21, 0xe5, 0x88, 0x13, 0x1a, 0xc6, 0x0a, 0x6e, 0x36, 0x3c, 0xc2, 0xf7, 0xba, 0x3b, 0x4d, + 0x87, 0x06, 0x2d, 0x8f, 0x7a, 0xb4, 0x25, 0x9b, 0x77, 0xba, 0xbb, 0xb2, 0x26, 0x2b, 0xb2, 0xa4, + 0xe1, 0xc0, 0x61, 0xf8, 0x99, 0x2e, 0x4f, 0xbb, 0x28, 0xde, 0xdb, 0xa1, 0x88, 0xb9, 0xba, 0x61, + 0x26, 0xa6, 0xdd, 0xd0, 0x75, 0x7c, 0xda, 0xd5, 0x2d, 0xd6, 0x3a, 0x00, 0x1b, 0xce, 0x1e, 0x6d, + 0x73, 0x86, 0x51, 0x60, 0x5e, 0x00, 0xb5, 0xcd, 0x30, 0xea, 0x72, 0x38, 0x03, 0xc6, 0x82, 0xd8, + 0x9b, 0x37, 0x96, 0x8d, 0xd5, 0x49, 0x5b, 0x14, 0x4d, 0x13, 0x8c, 0x3f, 0xee, 0xf2, 0xd2, 0x98, + 0xf5, 0x0d, 0x30, 0xb5, 0x8d, 0x63, 0x6e, 0x63, 0xe4, 0x6a, 0xa2, 0xba, 0x26, 0x1a, 0xf9, 0xd8, + 0x53, 0x00, 0xd6, 0x69, 0x37, 0xe4, 0x98, 0x6d, 0x86, 0x8e, 0xf9, 0x6e, 0x4e, 0x7b, 0x1f, 0xf7, + 0x12, 0xe0, 0x3e, 0xee, 0x89, 0x16, 0x0f, 0x45, 0xf3, 0x95, 0x65, 0x63, 0xd5, 0xb0, 0x45, 0xd1, + 0x5c, 0x4c, 0x69, 0xe7, 0x40, 0xed, 0x00, 0xf9, 0x5d, 0xac, 0xa3, 0xaa, 0x62, 0xb9, 0x60, 0xf6, + 0xa3, 0x6e, 0xb0, 0x83, 0x59, 0x1b, 0xf3, 0xcd, 0xdd, 0x7b, 0xc4, 0xf3, 0x30, 0x33, 0x5b, 0xc3, + 0x15, 0x4a, 0x59, 0x8e, 0x54, 0xf9, 0x08, 0xcc, 0x3e, 0xc4, 0xbd, 0xef, 0x89, 0x72, 0x9b, 0x33, + 0x12, 0x7a, 0x6d, 0xcc, 0x8f, 0xad, 0x32, 0x99, 0xa8, 0x4c, 0x24, 0x2a, 0x45, 0xbe, 0x07, 0x98, + 0xf7, 0xf5, 0x49, 0x3f, 0xdf, 0x30, 0x7f, 0x09, 0xb3, 0xb5, 0x05, 0x66, 0x12, 0xbe, 0x0f, 0x7c, + 0x8a, 0xf8, 0xdb, 0xd8, 0x33, 0x8a, 0xf6, 0x06, 0xe9, 0xfe, 0x33, 0x77, 0x69, 0xf6, 0xb6, 0xc1, + 0xe4, 0xfd, 0x64, 0x7c, 0x66, 0x03, 0xe6, 0xdb, 0xe9, 0x53, 0xff, 0x0f, 0xea, 0x38, 0xe4, 0x8c, + 0xe0, 0x58, 0xb2, 0x9e, 0xbc, 0x69, 0x36, 0x93, 0x99, 0x93, 0x8d, 0xeb, 0x0d, 0x85, 0xb0, 0x13, + 0xa8, 0xf5, 0x04, 0xd4, 0xbe, 0x8b, 0x9c, 0xfd, 0x17, 0x5f, 0x1f, 0xe3, 0x5d, 0x50, 0x5d, 0x67, + 0xf8, 0x59, 0x46, 0x78, 0x23, 0x25, 0x5c, 0x01, 0x55, 0x31, 0xdd, 0x34, 0x1b, 0x4c, 0xd9, 0xe4, + 0x1c, 0x14, 0x0f, 0xd9, 0x32, 0x6e, 0x3d, 0x04, 0xa7, 0xda, 0xe9, 0xcc, 0xdb, 0xc2, 0x19, 0xd5, + 0xcd, 0x94, 0x6a, 0x15, 0x54, 0x02, 0xac, 0x89, 0xe6, 0x53, 0xa2, 0xdc, 0x7c, 0xfd, 0x24, 0xc6, + 0xcc, 0xae, 0x04, 0xd8, 0xc2, 0xe0, 0x4c, 0x46, 0xf6, 0xc4, 0x47, 0x3d, 0x9f, 0xc4, 0x3c, 0xce, + 0x38, 0x37, 0x52, 0xce, 0xf7, 0xc1, 0x64, 0x94, 0xc4, 0x35, 0xf5, 0xa5, 0x32, 0xea, 0x94, 0xc4, + 0xce, 0xf0, 0xd6, 0x67, 0x06, 0x80, 0x45, 0x1d, 0x73, 0x35, 0xe9, 0xf0, 0x25, 0x70, 0x32, 0x01, + 0x77, 0x88, 0x2b, 0xe9, 0xab, 0x36, 0x48, 0x9a, 0x36, 0x5d, 0xf3, 0x5e, 0xea, 0xe3, 0x36, 0x98, + 0x48, 0xda, 0xb5, 0x8d, 0x85, 0x51, 0x36, 0xec, 0x14, 0x6d, 0x3d, 0x05, 0x33, 0x99, 0x87, 0x6d, + 0x86, 0x9c, 0xfd, 0xdc, 0x8b, 0x7e, 0x2b, 0x15, 0xb8, 0x09, 0xc6, 0xb9, 0x0c, 0x16, 0xfa, 0x35, + 0x47, 0xaf, 0x1e, 0xb7, 0x35, 0xd2, 0x8a, 0xc0, 0xf4, 0x00, 0xb5, 0x69, 0x25, 0xef, 0x76, 0x01, + 0x4c, 0x48, 0x54, 0xf6, 0x62, 0x75, 0x59, 0xdf, 0x74, 0xcd, 0x6f, 0xa6, 0xa2, 0x2d, 0x50, 0x93, + 0x8d, 0x5a, 0xf3, 0xc2, 0x50, 0x4d, 0x5b, 0xe1, 0xac, 0xbf, 0x18, 0xa0, 0xbe, 0x85, 0x39, 0x23, + 0x4e, 0xee, 0x25, 0xfe, 0x64, 0xe4, 0x46, 0xd3, 0x74, 0x2c, 0xd6, 0x7e, 0xa7, 0xb3, 0x43, 0x9f, + 0x77, 0x62, 0xf2, 0x42, 0x8d, 0x87, 0x9a, 0x7d, 0x5a, 0x35, 0xdf, 0xa3, 0xcf, 0xdb, 0xe4, 0x05, + 0x86, 0x6b, 0x60, 0x36, 0xc6, 0xec, 0x00, 0xb3, 0x4e, 0xcc, 0x11, 0xe3, 0x1d, 0x4e, 0x82, 0x64, + 0xe2, 0x4f, 0xab, 0x40, 0x5b, 0xb4, 0x6f, 0x93, 0x00, 0xc3, 0x26, 0x38, 0xa3, 0xb1, 0x4e, 0x97, + 0x31, 0x1c, 0x6a, 0xf4, 0x98, 0x44, 0x6b, 0x9a, 0x75, 0x15, 0x91, 0xf8, 0x2b, 0xe0, 0xb4, 0xc6, + 0x77, 0x23, 0x89, 0xac, 0x4a, 0xe4, 0x29, 0xd5, 0xf8, 0x89, 0x6c, 0xb3, 0x1a, 0xa0, 0xfa, 0x84, + 0x84, 0x5e, 0xf6, 0x12, 0x0b, 0xe9, 0x3b, 0x40, 0x50, 0x8d, 0x68, 0x98, 0x2c, 0xf3, 0xb2, 0x6c, + 0x7d, 0x07, 0xd4, 0x1f, 0xb2, 0x5e, 0xc4, 0x69, 0x6c, 0x5e, 0x4c, 0x32, 0x0c, 0x41, 0x75, 0x97, + 0xd1, 0x20, 0xc1, 0x89, 0xb2, 0x39, 0x9f, 0xb2, 0x4c, 0x81, 0x0a, 0xa7, 0x3a, 0x56, 0x51, 0xbb, + 0xd4, 0x76, 0xd4, 0xa3, 0x1b, 0x21, 0x75, 0x5c, 0x2c, 0x49, 0xa2, 0x6e, 0xa8, 0x48, 0x28, 0xcb, + 0x48, 0x28, 0xd3, 0x24, 0x11, 0x2f, 0x21, 0xf9, 0xb3, 0x01, 0x80, 0xda, 0x14, 0x48, 0xb8, 0x4b, + 0xcd, 0xa5, 0xc4, 0xca, 0x39, 0x30, 0x1e, 0xca, 0x66, 0x89, 0xad, 0xd8, 0xba, 0x66, 0xfe, 0x22, + 0xeb, 0x99, 0x75, 0x50, 0xdb, 0x45, 0x8e, 0x9c, 0x44, 0x63, 0xab, 0x27, 0x6f, 0x36, 0x9a, 0x03, + 0x5b, 0x78, 0x33, 0xe3, 0x6d, 0xaa, 0x47, 0x9a, 0x1f, 0x08, 0xbc, 0x58, 0x4b, 0x7a, 0xb6, 0x7a, + 0xd6, 0xbc, 0x0d, 0x40, 0xd6, 0x78, 0xdc, 0xdd, 0xe1, 0x4e, 0xe5, 0xb6, 0x61, 0xdd, 0x02, 0x13, + 0x5b, 0x94, 0xfc, 0x18, 0x91, 0x20, 0xb7, 0x74, 0xf4, 0x2d, 0xaf, 0xfb, 0x64, 0x77, 0x57, 0xb9, + 0x9b, 0xb4, 0x55, 0x45, 0x74, 0xd2, 0xf7, 0x29, 0x77, 0x87, 0x74, 0xd2, 0x33, 0xca, 0xdc, 0x24, + 0x6f, 0xa2, 0x6c, 0xbd, 0x07, 0x4e, 0xdf, 0xf5, 0x39, 0x66, 0x21, 0xe2, 0xf8, 0x11, 0xf5, 0xe8, + 0xb0, 0xce, 0x45, 0x7c, 0x2f, 0xed, 0x5c, 0xc4, 0xf7, 0xac, 0x15, 0x30, 0xdb, 0x8e, 0x18, 0x46, + 0x6e, 0xbc, 0x47, 0x18, 0xb7, 0x51, 0xe8, 0xd2, 0xdc, 0xf6, 0x9f, 0x6d, 0x1e, 0x57, 0xc0, 0x54, + 0x0e, 0x77, 0xd7, 0xf7, 0xcb, 0x40, 0xbf, 0xab, 0x01, 0x60, 0x63, 0x07, 0x73, 0x8e, 0x38, 0x65, + 0xe6, 0x2b, 0x23, 0x37, 0x5c, 0x62, 0x8c, 0x95, 0xe3, 0x31, 0x5b, 0x96, 0xe1, 0x75, 0x30, 0x13, + 0x20, 0x12, 0x76, 0x48, 0xe8, 0x31, 0xec, 0x12, 0x1c, 0xf2, 0x58, 0xa6, 0xae, 0x6a, 0x4f, 0x8b, + 0xf6, 0xcd, 0xac, 0x19, 0xde, 0x02, 0x67, 0x63, 0xec, 0xd0, 0xd0, 0x45, 0xac, 0xd7, 0x87, 0x1f, + 0x93, 0xf8, 0xb9, 0x34, 0x98, 0x7f, 0x68, 0x0e, 0xd4, 0x62, 0x8e, 0xa3, 0x58, 0x4e, 0x81, 0xaa, + 0xad, 0x2a, 0xe6, 0x1f, 0x2b, 0xf9, 0xbc, 0x73, 0xc2, 0x7d, 0xac, 0xf3, 0xa1, 0x2a, 0x62, 0x38, + 0x45, 0x98, 0x46, 0x3e, 0xd6, 0x66, 0x74, 0x0d, 0x9a, 0x60, 0x22, 0x40, 0x6c, 0xdf, 0xa5, 0xcf, + 0x42, 0x3d, 0xfd, 0xd2, 0x7a, 0x5e, 0x4a, 0xf6, 0xa0, 0xac, 0xc0, 0x8f, 0x4b, 0x5e, 0xb0, 0x26, + 0x07, 0xe0, 0x4a, 0x61, 0x00, 0x66, 0x59, 0x6b, 0x66, 0xef, 0x50, 0x4c, 0xc4, 0x0f, 0x87, 0x25, + 0x62, 0xfc, 0xad, 0x78, 0xcb, 0x13, 0x96, 0x74, 0x52, 0x3d, 0xeb, 0x24, 0xf3, 0x4b, 0x03, 0x80, + 0x0c, 0x23, 0x20, 0x21, 0x0a, 0x92, 0x8c, 0xc9, 0xb2, 0x48, 0xcc, 0x4f, 0xba, 0x28, 0xe4, 0x84, + 0xf7, 0xf4, 0xd0, 0x4f, 0xeb, 0x22, 0x99, 0x01, 0xe6, 0x7b, 0xd4, 0xd5, 0x29, 0xd3, 0x35, 0xd1, + 0xee, 0xe1, 0xd0, 0xc5, 0x4c, 0xaf, 0x4f, 0xba, 0x26, 0x93, 0xdc, 0xf5, 0x39, 0x11, 0xe9, 0xaf, + 0x2d, 0x1b, 0xab, 0x13, 0x76, 0x5a, 0x17, 0xda, 0xfb, 0x24, 0x74, 0xe7, 0xc7, 0x95, 0xb6, 0x28, + 0x8b, 0xa5, 0x54, 0x78, 0xe8, 0xa0, 0xd0, 0xed, 0xa4, 0x26, 0xea, 0x6a, 0x29, 0x15, 0x81, 0xbb, + 0xa1, 0xfb, 0xb1, 0x6e, 0xb6, 0xfe, 0x50, 0x07, 0x63, 0xed, 0xcd, 0xc7, 0xe6, 0xcf, 0x2a, 0xa0, + 0xfa, 0x21, 0x25, 0xa1, 0xc9, 0x72, 0xa3, 0x93, 0xd1, 0x6c, 0x31, 0x13, 0x65, 0xd8, 0x00, 0xd5, + 0x08, 0x63, 0x26, 0xdf, 0x28, 0xbf, 0x39, 0x24, 0x89, 0x6d, 0x6f, 0x3e, 0x6e, 0x3e, 0xc1, 0x98, + 0xd9, 0x12, 0x26, 0xd6, 0xfe, 0x00, 0x3d, 0xef, 0xf8, 0xd4, 0xeb, 0x24, 0x47, 0x94, 0x31, 0xb5, + 0xf6, 0x07, 0xe8, 0xf9, 0x23, 0xea, 0xe9, 0x53, 0x49, 0xff, 0xf6, 0x23, 0x9e, 0x4c, 0xd6, 0xa4, + 0x11, 0x0a, 0x0a, 0x67, 0x7e, 0x08, 0x6a, 0x1b, 0x07, 0xba, 0x13, 0xfe, 0x4b, 0xbb, 0xe6, 0xbf, + 0x0c, 0x30, 0x79, 0x8f, 0x51, 0xe4, 0x3a, 0x28, 0xe6, 0xe6, 0x83, 0x51, 0x89, 0x58, 0x53, 0xe7, + 0xfe, 0xca, 0xc0, 0xc9, 0x26, 0x4f, 0xbc, 0x15, 0x7b, 0xea, 0x23, 0x23, 0x5d, 0x09, 0xcc, 0x5f, + 0x19, 0xa3, 0xdc, 0xbe, 0x05, 0x67, 0xfa, 0x66, 0x63, 0xc7, 0xeb, 0x88, 0xf3, 0xa0, 0x4e, 0xe2, + 0x8e, 0x4f, 0x0e, 0xd4, 0xd6, 0x37, 0x61, 0x8f, 0x93, 0xf8, 0x11, 0x39, 0xc0, 0xe6, 0x35, 0x50, + 0xb3, 0x29, 0x0d, 0xe2, 0xfe, 0x85, 0x57, 0xd8, 0x49, 0x17, 0x5e, 0x59, 0x31, 0x3f, 0x05, 0xe0, + 0x3e, 0x89, 0x1d, 0x1a, 0x86, 0xd8, 0xe1, 0x5f, 0x6b, 0xd6, 0xff, 0x0f, 0x8c, 0x6d, 0xc5, 0x9e, + 0x60, 0xe2, 0xf8, 0x39, 0x4f, 0x98, 0x44, 0x39, 0xb7, 0x89, 0x55, 0xe4, 0xec, 0x4b, 0x36, 0xb1, + 0xf7, 0x41, 0x6d, 0x83, 0x31, 0xca, 0xc4, 0x91, 0x86, 0xc4, 0x1d, 0x2c, 0xca, 0xf2, 0xc1, 0x09, + 0xbb, 0x4e, 0x62, 0x15, 0x3a, 0x0f, 0xea, 0x98, 0xb1, 0x4e, 0x92, 0xd1, 0x49, 0x7b, 0x1c, 0x33, + 0xb6, 0x15, 0x7b, 0xe6, 0x53, 0x50, 0x15, 0xea, 0xa5, 0xb3, 0x76, 0x0e, 0xd4, 0x1c, 0xea, 0x53, + 0x96, 0xec, 0x56, 0xb2, 0x02, 0xaf, 0x81, 0xe9, 0x5d, 0x74, 0x40, 0x19, 0xe1, 0xb8, 0xa3, 0xfd, + 0xa8, 0x61, 0x3c, 0x95, 0x34, 0xab, 0x9d, 0xd2, 0x7c, 0x0a, 0xea, 0xeb, 0x34, 0x94, 0xd6, 0x93, + 0x24, 0x18, 0xc7, 0xeb, 0xa0, 0x25, 0x70, 0x32, 0xa4, 0x9d, 0x00, 0x73, 0xe4, 0x22, 0x8e, 0xa4, + 0xfc, 0x84, 0x0d, 0x42, 0xba, 0xa5, 0x5b, 0x6e, 0xfe, 0xd3, 0x04, 0xf5, 0x36, 0x66, 0x07, 0xc4, + 0xc1, 0x90, 0x81, 0x29, 0x7d, 0xf4, 0xd8, 0x08, 0x1d, 0x51, 0x80, 0x8b, 0x05, 0x7e, 0x0d, 0x68, + 0xaa, 0xcd, 0x68, 0x69, 0x68, 0x5c, 0xef, 0x51, 0x4b, 0x9f, 0xfd, 0xf5, 0x1f, 0xbf, 0xae, 0x5c, + 0xb0, 0xe6, 0xe4, 0xf7, 0xfa, 0xbe, 0x0a, 0xb6, 0xb0, 0xa2, 0xbf, 0x63, 0xac, 0xe5, 0x34, 0xef, + 0xe3, 0xff, 0xa9, 0xa6, 0x8b, 0x53, 0x4d, 0x92, 0x3f, 0x20, 0xc1, 0xcb, 0x05, 0xbe, 0x2c, 0xd8, + 0x94, 0x47, 0x27, 0xd3, 0x1a, 0x05, 0x51, 0x07, 0x28, 0x6b, 0x4e, 0xaa, 0x4e, 0x59, 0x93, 0x52, + 0x95, 0x47, 0x3d, 0x2a, 0xa4, 0xb6, 0xd5, 0xe1, 0x0f, 0x5e, 0x2c, 0x30, 0x88, 0x66, 0xfd, 0x46, + 0x0b, 0xe5, 0x41, 0xfd, 0x3a, 0xb3, 0x92, 0xf8, 0x24, 0x54, 0xc4, 0x91, 0x60, 0xdb, 0xcb, 0x7d, + 0x0c, 0xc2, 0xe5, 0xc2, 0xd3, 0x69, 0x4c, 0xf3, 0x5f, 0x1e, 0x81, 0xd0, 0x22, 0xe7, 0xa4, 0xc8, + 0x0c, 0x9c, 0x92, 0x22, 0xe9, 0xf7, 0x1d, 0xfc, 0x54, 0x7f, 0x20, 0xc2, 0xa2, 0x47, 0xd9, 0xae, + 0x15, 0x2e, 0x0d, 0x89, 0x6a, 0x76, 0x28, 0xd9, 0x4f, 0x41, 0x20, 0xd9, 0xf7, 0x24, 0xe1, 0xb6, + 0xfa, 0x50, 0x2c, 0xc9, 0x8c, 0x68, 0x1e, 0x9a, 0x19, 0x19, 0x2c, 0xcd, 0x8c, 0xf8, 0x76, 0x84, + 0xdd, 0xfc, 0xa9, 0xb5, 0xa4, 0x6b, 0x73, 0x47, 0x4f, 0xa5, 0x60, 0x1d, 0x7d, 0x3a, 0xb5, 0x96, + 0xa5, 0x8e, 0x09, 0xe7, 0xa5, 0x4e, 0x98, 0xc6, 0x5b, 0x2f, 0x55, 0xf9, 0x10, 0xfa, 0xf9, 0x93, + 0x58, 0x89, 0x6c, 0xdf, 0xc1, 0xa0, 0x5c, 0x36, 0x07, 0xd1, 0xb2, 0xe7, 0xa5, 0xec, 0x2c, 0x9c, + 0x96, 0xb2, 0x2c, 0xe3, 0x77, 0xb3, 0x13, 0x2e, 0x2c, 0xce, 0x86, 0x24, 0xa4, 0x95, 0x96, 0x87, + 0x03, 0xb4, 0xce, 0x59, 0xa9, 0x33, 0x0d, 0x4f, 0x4b, 0x9d, 0x20, 0x61, 0xfe, 0xa5, 0x51, 0x72, + 0x58, 0x85, 0xab, 0xc5, 0x15, 0x67, 0x10, 0xa3, 0x85, 0xaf, 0x1f, 0x03, 0xd9, 0x3f, 0x63, 0xe1, + 0x79, 0xe9, 0x20, 0xce, 0x60, 0x2d, 0xa6, 0x54, 0x0f, 0x07, 0xcf, 0xc3, 0xf0, 0x9d, 0x51, 0xec, + 0x77, 0x7d, 0x5f, 0x9b, 0x58, 0x39, 0x0a, 0xa6, 0x1d, 0x2c, 0x48, 0x07, 0xe7, 0xe0, 0x5c, 0xc1, + 0x01, 0xf2, 0x7d, 0x31, 0x56, 0xc5, 0xd7, 0x41, 0xc9, 0x58, 0x15, 0xcd, 0x43, 0xc7, 0xaa, 0x0c, + 0x96, 0x8e, 0xd5, 0x67, 0x82, 0xad, 0x37, 0xf0, 0x11, 0x01, 0xaf, 0x16, 0x18, 0xfa, 0xe2, 0x5a, + 0xe7, 0x9d, 0x23, 0x50, 0x5a, 0xf0, 0xa2, 0x14, 0x3c, 0x0b, 0xcf, 0xa8, 0x9b, 0xd2, 0x04, 0xd2, + 0xf0, 0x85, 0x52, 0xb7, 0xff, 0x8a, 0x05, 0x5e, 0x29, 0xa6, 0x29, 0x17, 0xd6, 0xc2, 0x57, 0x47, + 0x83, 0xb4, 0xae, 0x29, 0x75, 0xe7, 0x20, 0x54, 0x99, 0x4c, 0x11, 0xad, 0x00, 0xc3, 0x57, 0x46, + 0xe9, 0x6d, 0x0c, 0x5c, 0x1b, 0xc1, 0x9c, 0xa2, 0xb4, 0x8b, 0x77, 0x8f, 0x85, 0xd5, 0x66, 0x2e, + 0x4b, 0x33, 0x17, 0xe1, 0x85, 0x41, 0x33, 0xe9, 0xcd, 0x0d, 0xfc, 0x7d, 0xe9, 0xcd, 0x0d, 0xbc, + 0x7e, 0x0c, 0x19, 0xed, 0xe8, 0x38, 0xee, 0x13, 0x43, 0x2d, 0x69, 0xe8, 0x3a, 0xbc, 0x36, 0xd4, + 0x50, 0xeb, 0x65, 0xee, 0xa2, 0xe8, 0x10, 0xfe, 0xdc, 0x28, 0x5e, 0xea, 0xc0, 0x6b, 0x23, 0x14, + 0x15, 0x44, 0x5b, 0x5b, 0x3d, 0x1a, 0xa8, 0x8d, 0x2d, 0x4a, 0x63, 0xf3, 0xf0, 0xdc, 0xa0, 0x31, + 0x75, 0x01, 0x04, 0x3f, 0x37, 0x0a, 0x37, 0x40, 0x70, 0xe5, 0x28, 0x76, 0xed, 0xe2, 0x48, 0xbb, + 0x89, 0x89, 0xeb, 0xd2, 0xc4, 0x15, 0x78, 0xb9, 0xdc, 0x44, 0xeb, 0x65, 0x72, 0xcf, 0x74, 0x08, + 0x7f, 0x94, 0xde, 0x0e, 0x95, 0x1c, 0x18, 0x74, 0x64, 0xe8, 0x81, 0x21, 0x89, 0x6b, 0x59, 0xbd, + 0x75, 0xc3, 0x53, 0x6a, 0x01, 0xd4, 0xb4, 0x71, 0xfe, 0xc2, 0xbd, 0x64, 0x4d, 0xcf, 0x82, 0x43, + 0xd7, 0xf4, 0x1c, 0xa4, 0x34, 0xcd, 0x8e, 0x8a, 0x37, 0x48, 0xe8, 0xb4, 0x5e, 0xee, 0xe3, 0xde, + 0x21, 0xfc, 0xad, 0x51, 0x72, 0x17, 0x5f, 0xb2, 0xe8, 0x16, 0x30, 0x43, 0x17, 0xdd, 0x22, 0xb2, + 0x74, 0x28, 0xaa, 0x9d, 0xac, 0x11, 0x63, 0xde, 0x20, 0xbb, 0x8d, 0x1d, 0x89, 0x54, 0x9e, 0x5a, + 0x2f, 0xe5, 0xdd, 0xca, 0x21, 0xfc, 0x8d, 0x51, 0x72, 0x83, 0x5f, 0xe2, 0xad, 0x80, 0x19, 0xea, + 0xad, 0x88, 0xd4, 0xde, 0xd6, 0xa4, 0xb7, 0xab, 0xd6, 0x92, 0x3a, 0xc2, 0xe1, 0x5e, 0x43, 0x7a, + 0x68, 0xc4, 0x12, 0x28, 0x5c, 0x2a, 0x6f, 0xe2, 0x88, 0xf5, 0xca, 0x28, 0xf9, 0x11, 0x70, 0xa4, + 0xad, 0x07, 0xc7, 0xb6, 0xf5, 0x20, 0xb3, 0x75, 0x4d, 0xda, 0xba, 0x0c, 0x87, 0xd8, 0xf2, 0x12, + 0x5b, 0xf0, 0x0b, 0xa3, 0xf8, 0x33, 0xa1, 0x64, 0xd6, 0x0e, 0x42, 0x86, 0xce, 0xda, 0x02, 0xb0, + 0x7f, 0xc2, 0x58, 0x8b, 0x03, 0x86, 0x76, 0x05, 0xae, 0x3f, 0x4d, 0x9f, 0x1b, 0xc5, 0x1f, 0x12, + 0x47, 0x59, 0x7a, 0x70, 0x5c, 0x4b, 0xb9, 0x1c, 0xad, 0x48, 0x4b, 0xcb, 0xb0, 0xdc, 0x52, 0x96, + 0x22, 0x9e, 0xff, 0x97, 0x56, 0x32, 0xbd, 0xb2, 0xe0, 0xd0, 0xe9, 0x95, 0x83, 0xf4, 0x6f, 0x7a, + 0xd6, 0x8c, 0x14, 0xc7, 0xce, 0x1e, 0x15, 0x7d, 0x83, 0x51, 0x70, 0xc7, 0x58, 0x5b, 0x35, 0x6e, + 0x18, 0xf0, 0xa7, 0xc6, 0xe0, 0xdf, 0xb7, 0x92, 0x93, 0x44, 0x3f, 0x60, 0xe8, 0x49, 0x62, 0x00, + 0xa6, 0x2d, 0x5c, 0x92, 0x16, 0xce, 0xc3, 0xb3, 0xea, 0x3b, 0x00, 0xc7, 0xbc, 0x21, 0x0e, 0x13, + 0xda, 0xc7, 0x0d, 0xe3, 0xde, 0x7b, 0x5f, 0xbe, 0x5e, 0x34, 0xbe, 0x7a, 0xbd, 0x68, 0xfc, 0xfd, + 0xf5, 0xa2, 0xf1, 0xc5, 0x9b, 0xc5, 0x13, 0x5f, 0xbd, 0x59, 0x3c, 0xf1, 0xb7, 0x37, 0x8b, 0x27, + 0x7e, 0xb0, 0xd0, 0xf5, 0x39, 0xc3, 0xcd, 0x00, 0xb7, 0xb4, 0x54, 0x2b, 0xda, 0xf7, 0x5a, 0x5a, + 0x6e, 0x67, 0x5c, 0xfe, 0x83, 0xbc, 0xf5, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x10, 0x93, + 0xd0, 0x21, 0x1d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -8031,6 +8041,11 @@ func (m *SIO_Join_Input) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.MaxLogEntries != 0 { + i = encodeVarintCalcapi(dAtA, i, uint64(m.MaxLogEntries)) + i-- + dAtA[i] = 0x18 + } if m.Peer != nil { { size, err := m.Peer.MarshalToSizedBuffer(dAtA[:i]) @@ -9578,6 +9593,9 @@ func (m *SIO_Join_Input) Size() (n int) { l = m.Peer.Size() n += 1 + l + sovCalcapi(uint64(l)) } + if m.MaxLogEntries != 0 { + n += 1 + sovCalcapi(uint64(m.MaxLogEntries)) + } return n } @@ -16088,6 +16106,25 @@ func (m *SIO_Join_Input) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxLogEntries", wireType) + } + m.MaxLogEntries = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCalcapi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MaxLogEntries |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipCalcapi(dAtA[iNdEx:]) diff --git a/pkg/calcapi/socketio.go b/pkg/calcapi/socketio.go index 0ccb67ef..1115b5dc 100644 --- a/pkg/calcapi/socketio.go +++ b/pkg/calcapi/socketio.go @@ -2,7 +2,9 @@ package calcapi import ( "encoding/json" + "time" + engineio "github.com/googollee/go-engine.io" socketio "github.com/googollee/go-socket.io" "github.com/pkg/errors" "go.uber.org/zap" @@ -85,12 +87,18 @@ func (svc *svc) onEventJoin(s socketio.Conn, in *SIO_Join_Input) (*SIO_Join_Outp } // emit old logs - svc.sio.mutex.Lock() - defer svc.sio.mutex.Unlock() - if logs, ok := svc.sio.logs[in.Room]; ok { - for _, log := range logs { - out, _ := json.Marshal(log) - s.Emit("event:broadcast", string(out)) + if in.MaxLogEntries > 0 { + svc.sio.mutex.Lock() + defer svc.sio.mutex.Unlock() + if logs, ok := svc.sio.logs[in.Room]; ok { + start := 0 + if len(logs) > int(in.MaxLogEntries) { + start = len(logs) - int(in.MaxLogEntries) + } + for _, log := range logs[start:] { + out, _ := json.Marshal(log) + s.Emit("event:broadcast", string(out)) + } } } return &ret, nil @@ -128,7 +136,10 @@ func (svc *svc) onEventBroadcast(s socketio.Conn, in *SIO_Broadcast_Input) (*SIO } func (svc *svc) SocketIOServer() (*socketio.Server, error) { - server, err := socketio.NewServer(nil) + server, err := socketio.NewServer(&engineio.Options{ + PingInterval: 5 * time.Second, + PingTimeout: 10 * time.Second, + }) if err != nil { return nil, errors.Wrap(err, "socketio.NewServer") }