diff --git a/api/calcapi.proto b/api/calcapi.proto index 89bdd770..3a6ae24b 100644 --- a/api/calcapi.proto +++ b/api/calcapi.proto @@ -228,11 +228,13 @@ message SIO { } message Output { repeated Peer peers = 1; + int32 peer_count = 2; } message Event { string room = 1; Peer peer = 2; repeated Peer peers = 3; + int32 peer_count = 4; } } @@ -261,6 +263,7 @@ message SIO { string room = 1; Peer peer = 2; repeated Peer peers = 3; + int32 peer_count = 4; } } diff --git a/gen.sum b/gen.sum index 3e4351e2..10d105a5 100644 --- a/gen.sum +++ b/gen.sum @@ -1,5 +1,5 @@ 431b63cd908588e398bbb94d1e642e585441099c ./api/dashboard.proto 5c613daf5318661d709f8766163ef986d885b72d Makefile a0415fc5002d339337b03fe97801376ff3be3bbd ./api/crew.proto -bb7d0908e4e0c71743a94ae56410dee06780add5 ./api/calcapi.proto +e355c562a01935de08b7aaf5914ed862047bd4c6 ./api/calcapi.proto ffa8325482af5c58dd816e9404f0226db0a1d7de ./api/soundcloud.proto diff --git a/go.mod b/go.mod index eb071c58..8526153d 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/golang/protobuf v1.3.2 github.com/google/uuid v1.1.1 // indirect github.com/googollee/go-engine.io v1.4.2 - github.com/googollee/go-socket.io v1.4.2 + github.com/googollee/go-socket.io v1.4.3-0.20191204093753-683f8725b6d0 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect github.com/gorilla/mux v1.7.3 github.com/gorilla/websocket v1.4.1 // indirect @@ -55,6 +55,7 @@ require ( golang.org/x/tools v0.0.0-20191206204035-259af5ff87bd // indirect google.golang.org/genproto v0.0.0-20191206224255-0243a4be9c8f google.golang.org/grpc v1.25.1 + moul.io/godev v1.3.0 moul.io/zapgorm v0.0.0-20190706070406-8138918b527b ultre.me/kryptos v0.0.0-20181023194748-240fe1a16033 ultre.me/recettator v0.4.1-0.20190210231503-241df3a046a3 diff --git a/go.sum b/go.sum index 1084c2d8..1c628dcc 100644 --- a/go.sum +++ b/go.sum @@ -114,6 +114,8 @@ github.com/googollee/go-engine.io v1.4.2 h1:q0FNdZ2g5atRyO0j+P8rHvQf/JjjKHrCUCr2 github.com/googollee/go-engine.io v1.4.2/go.mod h1:26oFqHsnuWIzNOM0T08x21eQOydBosKOCgK3tyhzPPI= github.com/googollee/go-socket.io v1.4.2 h1:yxoY4jyPp91ksh0IDBOLrphRXg6EXG+QUdveqg1RGSc= github.com/googollee/go-socket.io v1.4.2/go.mod h1:yjlQxKcAZXZjpGwQVW/y1sgyL1ou+DdCpkswURDCRrU= +github.com/googollee/go-socket.io v1.4.3-0.20191204093753-683f8725b6d0 h1:7yrvhLv25w1vtVKrcg8CZAn4Pnkb6pzCAqnZ5y9O4q8= +github.com/googollee/go-socket.io v1.4.3-0.20191204093753-683f8725b6d0/go.mod h1:yjlQxKcAZXZjpGwQVW/y1sgyL1ou+DdCpkswURDCRrU= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -463,6 +465,8 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22 h1:0efs3hwEZhFKsCoP8l6dDB1AZWMgnEl3yWXWRZTOaEA= +gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -470,6 +474,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +moul.io/godev v1.3.0 h1:+GGk+scZhZ4citKb/lLubV/QJsu7OvB5UZhSYNQRCx4= +moul.io/godev v1.3.0/go.mod h1:xsV3hXF1E9vy2T/1b1CLjSImJ1/nQeTfqTDhJHhJCWg= moul.io/zapgorm v0.0.0-20190706070406-8138918b527b h1:7A2qUMck+Ikop+5+Ar6wyweFOHTwXEgHbNayY2mEB6Q= moul.io/zapgorm v0.0.0-20190706070406-8138918b527b/go.mod h1:JDE3xz5BQ1ccnAijE5+T8Qin6T256Bw2Cpdi+qMfWgw= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= diff --git a/pkg/calcapi/calcapi.pb.go b/pkg/calcapi/calcapi.pb.go index 89375e69..cb330314 100644 --- a/pkg/calcapi/calcapi.pb.go +++ b/pkg/calcapi/calcapi.pb.go @@ -3590,7 +3590,8 @@ func (m *SIO_Join_Input) GetMaxLogEntries() int32 { } type SIO_Join_Output struct { - Peers []*SIO_Peer `protobuf:"bytes,1,rep,name=peers,proto3" json:"peers,omitempty"` + Peers []*SIO_Peer `protobuf:"bytes,1,rep,name=peers,proto3" json:"peers,omitempty"` + PeerCount int32 `protobuf:"varint,2,opt,name=peer_count,json=peerCount,proto3" json:"peer_count,omitempty"` } func (m *SIO_Join_Output) Reset() { *m = SIO_Join_Output{} } @@ -3633,10 +3634,18 @@ func (m *SIO_Join_Output) GetPeers() []*SIO_Peer { return nil } +func (m *SIO_Join_Output) GetPeerCount() int32 { + if m != nil { + return m.PeerCount + } + return 0 +} + type SIO_Join_Event 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"` - Peers []*SIO_Peer `protobuf:"bytes,3,rep,name=peers,proto3" json:"peers,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"` + Peers []*SIO_Peer `protobuf:"bytes,3,rep,name=peers,proto3" json:"peers,omitempty"` + PeerCount int32 `protobuf:"varint,4,opt,name=peer_count,json=peerCount,proto3" json:"peer_count,omitempty"` } func (m *SIO_Join_Event) Reset() { *m = SIO_Join_Event{} } @@ -3693,6 +3702,13 @@ func (m *SIO_Join_Event) GetPeers() []*SIO_Peer { return nil } +func (m *SIO_Join_Event) GetPeerCount() int32 { + if m != nil { + return m.PeerCount + } + return 0 +} + type SIO_Broadcast struct { } @@ -4002,9 +4018,10 @@ func (m *SIO_Disconnect) XXX_DiscardUnknown() { var xxx_messageInfo_SIO_Disconnect proto.InternalMessageInfo type SIO_Disconnect_Event 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"` - Peers []*SIO_Peer `protobuf:"bytes,3,rep,name=peers,proto3" json:"peers,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"` + Peers []*SIO_Peer `protobuf:"bytes,3,rep,name=peers,proto3" json:"peers,omitempty"` + PeerCount int32 `protobuf:"varint,4,opt,name=peer_count,json=peerCount,proto3" json:"peer_count,omitempty"` } func (m *SIO_Disconnect_Event) Reset() { *m = SIO_Disconnect_Event{} } @@ -4061,6 +4078,13 @@ func (m *SIO_Disconnect_Event) GetPeers() []*SIO_Peer { return nil } +func (m *SIO_Disconnect_Event) GetPeerCount() int32 { + if m != nil { + return m.PeerCount + } + return 0 +} + type SIO_Msg struct { Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"` Number int64 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"` @@ -4383,153 +4407,155 @@ func init() { func init() { proto.RegisterFile("calcapi.proto", fileDescriptor_b4e0a0c9e1471050) } var fileDescriptor_b4e0a0c9e1471050 = []byte{ - // 2329 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcb, 0x73, 0xdc, 0x48, - 0x1d, 0x8e, 0xc6, 0x33, 0x1e, 0xbb, 0x93, 0xf8, 0xd1, 0x71, 0x12, 0x47, 0x71, 0x6c, 0x47, 0xc9, - 0x3a, 0x8e, 0xb7, 0x66, 0x26, 0x24, 0xb0, 0x15, 0xb2, 0x14, 0x45, 0xe2, 0x78, 0x83, 0x49, 0xbc, - 0xc9, 0x6a, 0xbc, 0x40, 0xe0, 0x30, 0xc8, 0x52, 0x5b, 0x6e, 0x2c, 0xa9, 0x45, 0xab, 0xc7, 0xf1, - 0xc4, 0xe5, 0x2a, 0x6a, 0xab, 0x28, 0xd8, 0xc3, 0x16, 0x9b, 0x82, 0x0b, 0x14, 0x7f, 0x02, 0x17, - 0xb8, 0xf0, 0x1f, 0x50, 0x7b, 0xdc, 0x2a, 0x2e, 0x1c, 0xa9, 0x84, 0x3b, 0xfc, 0x09, 0x54, 0x3f, - 0xf4, 0x98, 0x91, 0x34, 0x9e, 0xf0, 0x28, 0x6e, 0xdd, 0xfd, 0xfb, 0xf4, 0x7d, 0x9f, 0x7e, 0xfd, - 0x54, 0x0b, 0x9c, 0xb5, 0x2d, 0xcf, 0xb6, 0x42, 0xdc, 0x0c, 0x29, 0x61, 0x04, 0x4e, 0xf3, 0xea, - 0x0e, 0x7e, 0xd9, 0x54, 0xcd, 0xfa, 0x82, 0x4b, 0x88, 0xeb, 0xa1, 0x96, 0x15, 0xe2, 0x96, 0x15, - 0x04, 0x84, 0x59, 0x0c, 0x93, 0x20, 0x92, 0x70, 0xbd, 0xe1, 0x62, 0xb6, 0xd7, 0xdd, 0x69, 0xda, - 0xc4, 0x6f, 0xb9, 0xc4, 0x25, 0x2d, 0xd1, 0xbc, 0xd3, 0xdd, 0x15, 0x35, 0x51, 0x11, 0x25, 0x05, - 0x07, 0x36, 0x45, 0x2f, 0x54, 0x79, 0xda, 0xb1, 0xa2, 0xbd, 0x1d, 0x62, 0x51, 0x47, 0x35, 0xcc, - 0x44, 0xa4, 0x1b, 0x38, 0xb6, 0x47, 0xba, 0xaa, 0xc5, 0x58, 0x07, 0x60, 0xc3, 0xde, 0x23, 0x6d, - 0x46, 0x91, 0xe5, 0xeb, 0x97, 0x40, 0x6d, 0x33, 0x08, 0xbb, 0x0c, 0xce, 0x80, 0x31, 0x3f, 0x72, - 0xe7, 0xb5, 0x65, 0x6d, 0x75, 0xd2, 0xe4, 0x45, 0x5d, 0x07, 0xe3, 0x4f, 0xbb, 0xac, 0x30, 0x66, - 0x7c, 0x0d, 0x4c, 0x6d, 0xa3, 0x88, 0x99, 0xc8, 0x72, 0x14, 0x51, 0x5d, 0x11, 0x0d, 0x7d, 0xec, - 0x39, 0x00, 0xeb, 0xa4, 0x1b, 0x30, 0x44, 0x37, 0x03, 0x5b, 0x7f, 0x37, 0xa3, 0xbd, 0x8f, 0x7a, - 0x31, 0x70, 0x1f, 0xf5, 0x78, 0x8b, 0x6b, 0x85, 0xf3, 0x95, 0x65, 0x6d, 0x55, 0x33, 0x79, 0x51, - 0x5f, 0x4c, 0x68, 0xe7, 0x40, 0xed, 0xc0, 0xf2, 0xba, 0x48, 0x45, 0x65, 0xc5, 0x70, 0xc0, 0xec, - 0x87, 0x5d, 0x7f, 0x07, 0xd1, 0x36, 0x62, 0x9b, 0xbb, 0x0f, 0xb0, 0xeb, 0x22, 0xaa, 0xb7, 0xca, - 0x15, 0x0a, 0x59, 0x4e, 0x54, 0xf9, 0x10, 0xcc, 0x3e, 0x46, 0xbd, 0xef, 0xf2, 0x72, 0x9b, 0x51, - 0x1c, 0xb8, 0x6d, 0xc4, 0x46, 0x56, 0x99, 0x8c, 0x55, 0x26, 0x62, 0x95, 0x3c, 0xdf, 0x23, 0xc4, - 0xfa, 0xfa, 0xa4, 0x9f, 0xaf, 0xcc, 0x5f, 0xcc, 0x6c, 0x6c, 0x81, 0x99, 0x98, 0xef, 0x03, 0x8f, - 0x58, 0xec, 0x6d, 0xec, 0x69, 0x79, 0x7b, 0x83, 0x74, 0xff, 0x9e, 0xbb, 0x24, 0x7b, 0xdb, 0x60, - 0xf2, 0x61, 0x3c, 0x3e, 0xd3, 0x01, 0xf3, 0xcd, 0xe4, 0xa9, 0xaf, 0x82, 0x3a, 0x0a, 0x18, 0xc5, - 0x28, 0x12, 0xac, 0xa7, 0x6f, 0xeb, 0xcd, 0x78, 0xe6, 0xa4, 0xe3, 0x7a, 0x43, 0x22, 0xcc, 0x18, - 0x6a, 0x3c, 0x03, 0xb5, 0x6f, 0x5b, 0xf6, 0xfe, 0xcb, 0xff, 0x1e, 0xe3, 0x7d, 0x50, 0x5d, 0xa7, - 0xe8, 0x45, 0x4a, 0x78, 0x2b, 0x21, 0x5c, 0x01, 0x55, 0x3e, 0xdd, 0x14, 0x1b, 0x4c, 0xd8, 0xc4, - 0x1c, 0xe4, 0x0f, 0x99, 0x22, 0x6e, 0x3c, 0x06, 0x67, 0xda, 0xc9, 0xcc, 0xdb, 0x42, 0x29, 0xd5, - 0xed, 0x84, 0x6a, 0x15, 0x54, 0x7c, 0xa4, 0x88, 0xe6, 0x13, 0xa2, 0xcc, 0x7c, 0xfd, 0x38, 0x42, - 0xd4, 0xac, 0xf8, 0xc8, 0x40, 0xe0, 0x5c, 0x4a, 0xf6, 0xcc, 0xb3, 0x7a, 0x1e, 0x8e, 0x58, 0x94, - 0x72, 0x6e, 0x24, 0x9c, 0xef, 0x83, 0xc9, 0x30, 0x8e, 0x2b, 0xea, 0x2b, 0x45, 0xd4, 0x09, 0x89, - 0x99, 0xe2, 0x8d, 0x4f, 0x34, 0x00, 0xf3, 0x3a, 0xfa, 0x6a, 0xdc, 0xe1, 0x4b, 0xe0, 0x74, 0x0c, - 0xee, 0x60, 0x47, 0xd0, 0x57, 0x4d, 0x10, 0x37, 0x6d, 0x3a, 0xfa, 0x83, 0xc4, 0xc7, 0x5d, 0x30, - 0x11, 0xb7, 0x2b, 0x1b, 0x0b, 0xc3, 0x6c, 0x98, 0x09, 0xda, 0x78, 0x0e, 0x66, 0x52, 0x0f, 0xdb, - 0xd4, 0xb2, 0xf7, 0x33, 0x2f, 0xfa, 0x8d, 0x44, 0xe0, 0x36, 0x18, 0x67, 0x22, 0x98, 0xeb, 0xd7, - 0x0c, 0xbd, 0x7c, 0xdc, 0x54, 0x48, 0x23, 0x04, 0xd3, 0x03, 0xd4, 0xba, 0x11, 0xbf, 0xdb, 0x25, - 0x30, 0x21, 0x50, 0xe9, 0x8b, 0xd5, 0x45, 0x7d, 0xd3, 0xd1, 0xbf, 0x9e, 0x88, 0xb6, 0x40, 0x4d, - 0x34, 0x2a, 0xcd, 0x4b, 0xa5, 0x9a, 0xa6, 0xc4, 0x19, 0x7f, 0xd6, 0x40, 0x7d, 0x0b, 0x31, 0x8a, - 0xed, 0xcc, 0x4b, 0xfc, 0x41, 0xcb, 0x8c, 0xa6, 0xe9, 0x88, 0xaf, 0xfd, 0x76, 0x67, 0x87, 0x1c, - 0x76, 0x22, 0xfc, 0x52, 0x8e, 0x87, 0x9a, 0x79, 0x56, 0x36, 0x3f, 0x20, 0x87, 0x6d, 0xfc, 0x12, - 0xc1, 0x35, 0x30, 0x1b, 0x21, 0x7a, 0x80, 0x68, 0x27, 0x62, 0x16, 0x65, 0x1d, 0x86, 0xfd, 0x78, - 0xe2, 0x4f, 0xcb, 0x40, 0x9b, 0xb7, 0x6f, 0x63, 0x1f, 0xc1, 0x26, 0x38, 0xa7, 0xb0, 0x76, 0x97, - 0x52, 0x14, 0x28, 0xf4, 0x98, 0x40, 0x2b, 0x9a, 0x75, 0x19, 0x11, 0xf8, 0x6b, 0xe0, 0xac, 0xc2, - 0x77, 0x43, 0x81, 0xac, 0x0a, 0xe4, 0x19, 0xd9, 0xf8, 0xb1, 0x68, 0x33, 0x1a, 0xa0, 0xfa, 0x0c, - 0x07, 0x6e, 0xfa, 0x12, 0x0b, 0xc9, 0x3b, 0x40, 0x50, 0x0d, 0x49, 0x10, 0x2f, 0xf3, 0xa2, 0x6c, - 0x7c, 0x0b, 0xd4, 0x1f, 0xd3, 0x5e, 0xc8, 0x48, 0xa4, 0x5f, 0x8e, 0x33, 0x0c, 0x41, 0x75, 0x97, - 0x12, 0x3f, 0xc6, 0xf1, 0xb2, 0x3e, 0x9f, 0xb0, 0x4c, 0x81, 0x0a, 0x23, 0x2a, 0x56, 0x91, 0xbb, - 0xd4, 0x76, 0xd8, 0x23, 0x1b, 0x01, 0xb1, 0x1d, 0x24, 0x48, 0xc2, 0x6e, 0x20, 0x49, 0x08, 0x4d, - 0x49, 0x08, 0x55, 0x24, 0x21, 0x2b, 0x20, 0xf9, 0x93, 0x06, 0x80, 0xdc, 0x14, 0x70, 0xb0, 0x4b, - 0xf4, 0xa5, 0xd8, 0xca, 0x05, 0x30, 0x1e, 0x88, 0x66, 0x81, 0xad, 0x98, 0xaa, 0xa6, 0xff, 0x3c, - 0xed, 0x99, 0x75, 0x50, 0xdb, 0xb5, 0x6c, 0x31, 0x89, 0xc6, 0x56, 0x4f, 0xdf, 0x6e, 0x34, 0x07, - 0xb6, 0xf0, 0x66, 0xca, 0xdb, 0x94, 0x8f, 0x34, 0x3f, 0xe0, 0x78, 0xbe, 0x96, 0xf4, 0x4c, 0xf9, - 0xac, 0x7e, 0x17, 0x80, 0xb4, 0x71, 0xd4, 0xdd, 0xe1, 0x5e, 0xe5, 0xae, 0x66, 0xdc, 0x01, 0x13, - 0x5b, 0x04, 0xff, 0xd8, 0xc2, 0x7e, 0x66, 0xe9, 0xe8, 0x5b, 0x5e, 0xf7, 0xf1, 0xee, 0xae, 0x74, - 0x37, 0x69, 0xca, 0x0a, 0xef, 0xa4, 0xef, 0x11, 0xe6, 0x94, 0x74, 0xd2, 0x0b, 0x42, 0x9d, 0x38, - 0x6f, 0xbc, 0x6c, 0xbc, 0x07, 0xce, 0xde, 0xf7, 0x18, 0xa2, 0x81, 0xc5, 0xd0, 0x13, 0xe2, 0x92, - 0xb2, 0xce, 0xb5, 0xd8, 0x5e, 0xd2, 0xb9, 0x16, 0xdb, 0x33, 0x56, 0xc0, 0x6c, 0x3b, 0xa4, 0xc8, - 0x72, 0xa2, 0x3d, 0x4c, 0x99, 0x69, 0x05, 0x0e, 0xc9, 0x6c, 0xff, 0xe9, 0xe6, 0x71, 0x0d, 0x4c, - 0x65, 0x70, 0xf7, 0x3d, 0xaf, 0x08, 0xf4, 0xdb, 0x1a, 0x00, 0x26, 0xb2, 0x11, 0x63, 0x16, 0x23, - 0x54, 0x7f, 0xa5, 0x65, 0x86, 0x4b, 0x84, 0x90, 0x74, 0x3c, 0x66, 0x8a, 0x32, 0xbc, 0x09, 0x66, - 0x7c, 0x0b, 0x07, 0x1d, 0x1c, 0xb8, 0x14, 0x39, 0x18, 0x05, 0x2c, 0x12, 0xa9, 0xab, 0x9a, 0xd3, - 0xbc, 0x7d, 0x33, 0x6d, 0x86, 0x77, 0xc0, 0xf9, 0x08, 0xd9, 0x24, 0x70, 0x2c, 0xda, 0xeb, 0xc3, - 0x8f, 0x09, 0xfc, 0x5c, 0x12, 0xcc, 0x3e, 0x34, 0x07, 0x6a, 0x11, 0x43, 0x61, 0x24, 0xa6, 0x40, - 0xd5, 0x94, 0x15, 0xfd, 0xf7, 0x95, 0x6c, 0xde, 0x19, 0x66, 0x1e, 0x52, 0xf9, 0x90, 0x15, 0x3e, - 0x9c, 0x42, 0x44, 0x42, 0x0f, 0x29, 0x33, 0xaa, 0x06, 0x75, 0x30, 0xe1, 0x5b, 0x74, 0xdf, 0x21, - 0x2f, 0x02, 0x35, 0xfd, 0x92, 0x7a, 0x56, 0x4a, 0xf4, 0xa0, 0xa8, 0xc0, 0x8f, 0x0a, 0x5e, 0xb0, - 0x26, 0x06, 0xe0, 0x4a, 0x6e, 0x00, 0xa6, 0x59, 0x6b, 0xa6, 0xef, 0x90, 0x4f, 0xc4, 0x0f, 0xcb, - 0x12, 0x31, 0xfe, 0x56, 0xbc, 0xc5, 0x09, 0x8b, 0x3b, 0xa9, 0x9e, 0x76, 0x92, 0xfe, 0x85, 0x06, - 0x40, 0x8a, 0xe1, 0x90, 0xc0, 0xf2, 0xe3, 0x8c, 0x89, 0x32, 0x4f, 0xcc, 0x4f, 0xba, 0x56, 0xc0, - 0x30, 0xeb, 0xa9, 0xa1, 0x9f, 0xd4, 0x79, 0x32, 0x7d, 0xc4, 0xf6, 0x88, 0xa3, 0x52, 0xa6, 0x6a, - 0xbc, 0xdd, 0x45, 0x81, 0x83, 0xa8, 0x5a, 0x9f, 0x54, 0x4d, 0x24, 0xb9, 0xeb, 0x31, 0xcc, 0xd3, - 0x5f, 0x5b, 0xd6, 0x56, 0x27, 0xcc, 0xa4, 0xce, 0xb5, 0xf7, 0x71, 0xe0, 0xcc, 0x8f, 0x4b, 0x6d, - 0x5e, 0xe6, 0x4b, 0x29, 0xf7, 0xd0, 0xb1, 0x02, 0xa7, 0x93, 0x98, 0xa8, 0xcb, 0xa5, 0x94, 0x07, - 0xee, 0x07, 0xce, 0x47, 0xaa, 0xd9, 0xf8, 0xc5, 0x04, 0x18, 0x6b, 0x6f, 0x3e, 0xd5, 0xff, 0x58, - 0x01, 0xd5, 0xef, 0x10, 0x1c, 0xe8, 0x34, 0x33, 0x3a, 0x29, 0x49, 0x17, 0x33, 0x5e, 0x86, 0x0d, - 0x50, 0x0d, 0x11, 0xa2, 0xe2, 0x8d, 0xb2, 0x9b, 0x43, 0x9c, 0xd8, 0xf6, 0xe6, 0xd3, 0xe6, 0x33, - 0x84, 0xa8, 0x29, 0x60, 0x7c, 0xed, 0xf7, 0xad, 0xc3, 0x8e, 0x47, 0xdc, 0x4e, 0x7c, 0x44, 0x19, - 0x93, 0x6b, 0xbf, 0x6f, 0x1d, 0x3e, 0x21, 0xae, 0x3a, 0x95, 0xf4, 0x6f, 0x3f, 0xfc, 0xc9, 0x78, - 0x4d, 0x1a, 0xa2, 0x20, 0x71, 0xfa, 0x11, 0xa8, 0x6d, 0x1c, 0xa8, 0x4e, 0xf8, 0x4f, 0xed, 0x26, - 0xe2, 0x63, 0x23, 0x8a, 0xff, 0x53, 0x03, 0x93, 0x0f, 0x28, 0xb1, 0x1c, 0xdb, 0x8a, 0x98, 0xfe, - 0x68, 0x58, 0xe6, 0xd6, 0xe4, 0x87, 0x42, 0x65, 0xe0, 0x28, 0x94, 0x65, 0xde, 0x8a, 0x5c, 0xf9, - 0x55, 0x92, 0x2c, 0x1d, 0xfa, 0x2f, 0xb5, 0x61, 0xaf, 0xf7, 0x16, 0x9c, 0x49, 0x2a, 0xc6, 0x46, - 0x4b, 0xc5, 0x45, 0x50, 0xc7, 0x51, 0xc7, 0xc3, 0x07, 0x72, 0xaf, 0x9c, 0x30, 0xc7, 0x71, 0xf4, - 0x04, 0x1f, 0x20, 0xfd, 0x06, 0xa8, 0x99, 0x84, 0xf8, 0x51, 0xff, 0x4a, 0xcd, 0xed, 0x24, 0x2b, - 0xb5, 0xa8, 0xe8, 0x9f, 0x6a, 0x00, 0x3c, 0xc4, 0x91, 0x4d, 0x82, 0x00, 0xd9, 0xec, 0xff, 0xdb, - 0x4f, 0x5f, 0x01, 0x63, 0x5b, 0x91, 0xcb, 0xa5, 0x19, 0x3a, 0x64, 0xb1, 0x34, 0x2f, 0x67, 0xf6, - 0xc9, 0x8a, 0x98, 0xe0, 0xf1, 0x3e, 0xf9, 0x3e, 0xa8, 0x6d, 0x50, 0x4a, 0x28, 0x3f, 0x35, 0xe1, - 0xa8, 0x83, 0x78, 0x59, 0x3c, 0x38, 0x61, 0xd6, 0x71, 0x24, 0x43, 0x17, 0x41, 0x1d, 0x51, 0xda, - 0x89, 0xfb, 0x60, 0xd2, 0x1c, 0x47, 0x94, 0x6e, 0x45, 0xae, 0xfe, 0x1c, 0x54, 0xb9, 0x7c, 0xe1, - 0xc2, 0x30, 0x07, 0x6a, 0x36, 0xf1, 0x08, 0x8d, 0x37, 0x44, 0x51, 0x81, 0x37, 0xc0, 0xf4, 0xae, - 0x75, 0x40, 0x28, 0x66, 0xa8, 0xa3, 0xfc, 0xc8, 0x99, 0x32, 0x15, 0x37, 0xcb, 0xcd, 0x58, 0x7f, - 0x0e, 0xea, 0xeb, 0x24, 0x10, 0xd6, 0xe3, 0xac, 0x69, 0xa3, 0x65, 0x6d, 0x09, 0x9c, 0x0e, 0x48, - 0xc7, 0x47, 0xcc, 0x72, 0x2c, 0x66, 0x09, 0xf9, 0x09, 0x13, 0x04, 0x64, 0x4b, 0xb5, 0xdc, 0xfe, - 0x87, 0x0e, 0xea, 0x6d, 0x44, 0x0f, 0xb0, 0x8d, 0x20, 0x05, 0x53, 0xea, 0x74, 0xb3, 0x11, 0xd8, - 0xbc, 0x00, 0x17, 0x73, 0xfc, 0x0a, 0xd0, 0x94, 0xfb, 0xdd, 0x52, 0x69, 0x5c, 0x6d, 0x83, 0x4b, - 0x9f, 0xfc, 0xe5, 0xef, 0xbf, 0xaa, 0x5c, 0x32, 0xe6, 0xc4, 0x95, 0xc0, 0xbe, 0x0c, 0xb6, 0x90, - 0xa4, 0xbf, 0xa7, 0xad, 0x65, 0x34, 0x1f, 0xa2, 0xff, 0xa9, 0xa6, 0x83, 0x12, 0x4d, 0x9c, 0x3d, - 0x83, 0xc1, 0xab, 0x39, 0xbe, 0x34, 0xd8, 0x14, 0xa7, 0x33, 0xdd, 0x18, 0x06, 0x91, 0x67, 0x34, - 0x63, 0x4e, 0xa8, 0x4e, 0x19, 0x93, 0x42, 0x95, 0x85, 0x3d, 0xc2, 0xa5, 0xb6, 0xe5, 0xf9, 0x12, - 0x5e, 0xce, 0x31, 0xf0, 0x66, 0xf5, 0x46, 0x0b, 0xc5, 0x41, 0xf5, 0x3a, 0xb3, 0x82, 0xf8, 0x34, - 0x94, 0xc4, 0x21, 0x67, 0xdb, 0xcb, 0x7c, 0x6f, 0xc2, 0xe5, 0xdc, 0xd3, 0x49, 0x4c, 0xf1, 0x5f, - 0x1d, 0x82, 0x50, 0x22, 0x17, 0x84, 0xc8, 0x0c, 0x9c, 0x12, 0x22, 0xc9, 0x27, 0x24, 0xfc, 0xbe, - 0xfa, 0x06, 0x85, 0x79, 0x8f, 0xa2, 0x5d, 0x29, 0x5c, 0x29, 0x89, 0x2a, 0x76, 0x28, 0xd8, 0xcf, - 0x40, 0x20, 0xd8, 0xf7, 0x04, 0xe1, 0xb6, 0xfc, 0x16, 0x2d, 0xc8, 0x0c, 0x6f, 0x2e, 0xcd, 0x8c, - 0x08, 0x16, 0x66, 0x86, 0x7f, 0x9e, 0xc2, 0x6e, 0xf6, 0x60, 0x5c, 0xd0, 0xb5, 0x99, 0xd3, 0xad, - 0x54, 0x30, 0x4e, 0x3e, 0x00, 0x1b, 0xcb, 0x42, 0x47, 0x87, 0xf3, 0x42, 0x27, 0x48, 0xe2, 0xad, - 0x23, 0x59, 0x3e, 0x86, 0x5e, 0xf6, 0xb0, 0x57, 0x20, 0xdb, 0x77, 0xf6, 0x28, 0x96, 0xcd, 0x40, - 0x94, 0xec, 0x45, 0x21, 0x3b, 0x0b, 0xa7, 0x85, 0x2c, 0x4d, 0xf9, 0x9d, 0xf4, 0x10, 0x0d, 0xf3, - 0xb3, 0x21, 0x0e, 0x29, 0xa5, 0xe5, 0x72, 0x80, 0xd2, 0x39, 0x2f, 0x74, 0xa6, 0xe1, 0x59, 0xa1, - 0xe3, 0xc7, 0xcc, 0x9f, 0x6a, 0x05, 0xe7, 0x61, 0xb8, 0x9a, 0x5f, 0x71, 0x06, 0x31, 0x4a, 0xf8, - 0xe6, 0x08, 0xc8, 0xfe, 0x19, 0x0b, 0x2f, 0x0a, 0x07, 0x51, 0x0a, 0x6b, 0x51, 0xa9, 0x7a, 0x3c, - 0x78, 0xe4, 0x86, 0xef, 0x0c, 0x63, 0xbf, 0xef, 0x79, 0xca, 0xc4, 0xca, 0x49, 0x30, 0xe5, 0x60, - 0x41, 0x38, 0xb8, 0x00, 0xe7, 0x72, 0x0e, 0x2c, 0xcf, 0xe3, 0x63, 0x95, 0x7f, 0x80, 0x14, 0x8c, - 0x55, 0xde, 0x5c, 0x3a, 0x56, 0x45, 0xb0, 0x70, 0xac, 0xbe, 0xe0, 0x6c, 0xbd, 0x81, 0xef, 0x14, - 0x78, 0x3d, 0xc7, 0xd0, 0x17, 0x57, 0x3a, 0xef, 0x9c, 0x80, 0x52, 0x82, 0x97, 0x85, 0xe0, 0x79, - 0x78, 0x4e, 0x5e, 0xc6, 0xc6, 0x90, 0x86, 0xc7, 0x95, 0xba, 0xfd, 0xb7, 0x38, 0xf0, 0x5a, 0x3e, - 0x4d, 0x99, 0xb0, 0x12, 0xbe, 0x3e, 0x1c, 0xa4, 0x74, 0x75, 0xa1, 0x3b, 0x07, 0xa1, 0xcc, 0x64, - 0x82, 0x68, 0xf9, 0x08, 0xbe, 0xd2, 0x0a, 0x2f, 0x7c, 0xe0, 0xda, 0x10, 0xe6, 0x04, 0xa5, 0x5c, - 0xbc, 0x3b, 0x12, 0x56, 0x99, 0xb9, 0x2a, 0xcc, 0x5c, 0x86, 0x97, 0x06, 0xcd, 0x24, 0x97, 0x43, - 0xf0, 0x77, 0x85, 0x97, 0x43, 0xf0, 0xe6, 0x08, 0x32, 0xca, 0xd1, 0x28, 0xee, 0x63, 0x43, 0x2d, - 0x61, 0xe8, 0x26, 0xbc, 0x51, 0x6a, 0xa8, 0x75, 0x94, 0xb9, 0x8b, 0x3a, 0x86, 0x3f, 0xd3, 0xf2, - 0xf7, 0x46, 0xf0, 0xc6, 0x10, 0x45, 0x09, 0x51, 0xd6, 0x56, 0x4f, 0x06, 0x2a, 0x63, 0x8b, 0xc2, - 0xd8, 0x3c, 0xbc, 0x30, 0x68, 0x4c, 0xde, 0x31, 0xc1, 0xcf, 0xb4, 0xdc, 0x25, 0x13, 0x5c, 0x39, - 0x89, 0x5d, 0xb9, 0x38, 0xd1, 0x6e, 0x6c, 0xe2, 0xa6, 0x30, 0x71, 0x0d, 0x5e, 0x2d, 0x36, 0xd1, - 0x3a, 0x8a, 0xaf, 0xb2, 0x8e, 0xe1, 0x8f, 0x92, 0x0b, 0xa8, 0x82, 0x03, 0x83, 0x8a, 0x94, 0x1e, - 0x18, 0xe2, 0xb8, 0x92, 0x55, 0x5b, 0x37, 0x3c, 0x23, 0x17, 0x40, 0x45, 0x1b, 0x65, 0xef, 0xf4, - 0x0b, 0xd6, 0xf4, 0x34, 0x58, 0xba, 0xa6, 0x67, 0x20, 0x85, 0x69, 0xb6, 0x65, 0xbc, 0x81, 0x03, - 0xbb, 0x75, 0xb4, 0x8f, 0x7a, 0xc7, 0xf0, 0x37, 0x5a, 0xc1, 0x75, 0x7f, 0xc1, 0xa2, 0x9b, 0xc3, - 0x94, 0x2e, 0xba, 0x79, 0x64, 0xe1, 0x50, 0x94, 0x3b, 0x59, 0x23, 0x42, 0xac, 0x81, 0x77, 0x1b, - 0x3b, 0x02, 0x29, 0x3d, 0xb5, 0x8e, 0xc4, 0xf5, 0xcd, 0x31, 0xfc, 0xb5, 0x56, 0xf0, 0x93, 0xa0, - 0xc0, 0x5b, 0x0e, 0x53, 0xea, 0x2d, 0x8f, 0x54, 0xde, 0xd6, 0x84, 0xb7, 0xeb, 0xc6, 0x92, 0x3c, - 0xc2, 0xa1, 0x5e, 0x43, 0x78, 0x68, 0x44, 0x02, 0xc8, 0x5d, 0x4a, 0x6f, 0xfc, 0x88, 0xf5, 0x4a, - 0x2b, 0xf8, 0xd7, 0x70, 0xa2, 0xad, 0x47, 0x23, 0xdb, 0x7a, 0x94, 0xda, 0xba, 0x21, 0x6c, 0x5d, - 0x85, 0x25, 0xb6, 0xdc, 0xd8, 0x16, 0xfc, 0x5c, 0xcb, 0xff, 0xaf, 0x28, 0x98, 0xb5, 0x83, 0x90, - 0xd2, 0x59, 0x9b, 0x03, 0xf6, 0x4f, 0x18, 0x63, 0x71, 0xc0, 0xd0, 0x2e, 0xc7, 0xf5, 0xa7, 0xe9, - 0x33, 0x2d, 0xff, 0xcf, 0xe3, 0x24, 0x4b, 0x8f, 0x46, 0xb5, 0x94, 0xc9, 0xd1, 0x8a, 0xb0, 0xb4, - 0x0c, 0x8b, 0x2d, 0xa5, 0x29, 0x62, 0xd9, 0xdf, 0x75, 0x05, 0xd3, 0x2b, 0x0d, 0x96, 0x4e, 0xaf, - 0x0c, 0xa4, 0x7f, 0xd3, 0x33, 0x66, 0x84, 0x38, 0xb2, 0xf7, 0x08, 0xef, 0x1b, 0x64, 0xf9, 0xf7, - 0xb4, 0xb5, 0x55, 0xed, 0x96, 0x06, 0x7f, 0xaa, 0x0d, 0xfe, 0xe0, 0x2b, 0x38, 0x49, 0xf4, 0x03, - 0x4a, 0x4f, 0x12, 0x03, 0x30, 0x65, 0xe1, 0x8a, 0xb0, 0x70, 0x11, 0x9e, 0x97, 0xdf, 0x01, 0x28, - 0x62, 0x0d, 0x7e, 0x98, 0x50, 0x3e, 0x6e, 0x69, 0x0f, 0xde, 0xfb, 0xe2, 0xf5, 0xa2, 0xf6, 0xe5, - 0xeb, 0x45, 0xed, 0x6f, 0xaf, 0x17, 0xb5, 0xcf, 0xdf, 0x2c, 0x9e, 0xfa, 0xf2, 0xcd, 0xe2, 0xa9, - 0xbf, 0xbe, 0x59, 0x3c, 0xf5, 0x83, 0x85, 0xae, 0xc7, 0x28, 0x6a, 0xfa, 0xa8, 0xa5, 0xa4, 0x5a, - 0xe1, 0xbe, 0xdb, 0x52, 0x72, 0x3b, 0xe3, 0xe2, 0x37, 0xe7, 0x9d, 0x7f, 0x05, 0x00, 0x00, 0xff, - 0xff, 0xab, 0xe9, 0xc4, 0x54, 0x84, 0x1d, 0x00, 0x00, + // 2358 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x5d, 0x6f, 0xdc, 0x58, + 0xfd, 0x5e, 0x4f, 0x66, 0x32, 0xc9, 0xaf, 0x6d, 0x5e, 0x4e, 0xd3, 0x36, 0x75, 0xd3, 0x24, 0x75, + 0xbb, 0x69, 0x9a, 0xd5, 0xcc, 0xf4, 0xdf, 0xfe, 0x59, 0x95, 0x2e, 0x42, 0xb4, 0x69, 0xb6, 0x84, + 0x36, 0xdb, 0xae, 0x27, 0x0b, 0x5b, 0xb8, 0x18, 0x1c, 0xfb, 0xc4, 0x31, 0xb1, 0x7d, 0xcc, 0xf1, + 0x99, 0xb4, 0xd3, 0x2a, 0x12, 0x5a, 0x09, 0x21, 0x2e, 0x56, 0x6c, 0x05, 0x37, 0xac, 0xf8, 0x02, + 0x48, 0xdc, 0x70, 0xc5, 0x37, 0x40, 0x7b, 0xb9, 0x12, 0x37, 0x5c, 0xa2, 0x16, 0x89, 0x4b, 0xe0, + 0x1b, 0xa0, 0xf3, 0xe2, 0x97, 0x19, 0x7b, 0x26, 0xe9, 0x02, 0x12, 0x77, 0xe7, 0x9c, 0xdf, 0xe3, + 0xe7, 0x79, 0xfc, 0x3b, 0xaf, 0x3e, 0x86, 0x53, 0xb6, 0xe5, 0xdb, 0x56, 0xe4, 0x35, 0x23, 0x4a, + 0x18, 0x41, 0xd3, 0xbc, 0xba, 0xe3, 0x3d, 0x6f, 0xaa, 0x66, 0x7d, 0xc1, 0x25, 0xc4, 0xf5, 0x71, + 0xcb, 0x8a, 0xbc, 0x96, 0x15, 0x86, 0x84, 0x59, 0xcc, 0x23, 0x61, 0x2c, 0xe1, 0x7a, 0xc3, 0xf5, + 0xd8, 0x5e, 0x77, 0xa7, 0x69, 0x93, 0xa0, 0xe5, 0x12, 0x97, 0xb4, 0x44, 0xf3, 0x4e, 0x77, 0x57, + 0xd4, 0x44, 0x45, 0x94, 0x14, 0x1c, 0x6c, 0x8a, 0x9f, 0xaa, 0xf2, 0xb4, 0x63, 0xc5, 0x7b, 0x3b, + 0xc4, 0xa2, 0x8e, 0x6a, 0x98, 0x89, 0x49, 0x37, 0x74, 0x6c, 0x9f, 0x74, 0x55, 0x8b, 0xb1, 0x0e, + 0xb0, 0x61, 0xef, 0x91, 0x36, 0xa3, 0xd8, 0x0a, 0xf4, 0xf3, 0x50, 0xdb, 0x0c, 0xa3, 0x2e, 0x43, + 0x33, 0x30, 0x16, 0xc4, 0xee, 0xbc, 0xb6, 0xac, 0xad, 0x4e, 0x9a, 0xbc, 0xa8, 0xeb, 0x30, 0xfe, + 0xa8, 0xcb, 0x4a, 0x63, 0xc6, 0xd7, 0x60, 0x6a, 0x1b, 0xc7, 0xcc, 0xc4, 0x96, 0xa3, 0x88, 0xea, + 0x8a, 0x68, 0xe4, 0x63, 0x4f, 0x00, 0xd6, 0x49, 0x37, 0x64, 0x98, 0x6e, 0x86, 0xb6, 0xfe, 0x4e, + 0x4e, 0x7b, 0x1f, 0xf7, 0x12, 0xe0, 0x3e, 0xee, 0xf1, 0x16, 0xd7, 0x8a, 0xe6, 0x2b, 0xcb, 0xda, + 0xaa, 0x66, 0xf2, 0xa2, 0xbe, 0x98, 0xd2, 0xce, 0x41, 0xed, 0xc0, 0xf2, 0xbb, 0x58, 0x45, 0x65, + 0xc5, 0x70, 0x60, 0xf6, 0x83, 0x6e, 0xb0, 0x83, 0x69, 0x1b, 0xb3, 0xcd, 0xdd, 0xbb, 0x9e, 0xeb, + 0x62, 0xaa, 0xb7, 0x86, 0x2b, 0x94, 0xb2, 0x1c, 0xa9, 0xf2, 0x01, 0xcc, 0x3e, 0xc0, 0xbd, 0xef, + 0xf2, 0x72, 0x9b, 0x51, 0x2f, 0x74, 0xdb, 0x98, 0x1d, 0x5b, 0x65, 0x32, 0x51, 0x99, 0x48, 0x54, + 0x8a, 0x7c, 0xf7, 0x31, 0xeb, 0xeb, 0x93, 0x7e, 0xbe, 0x61, 0xfe, 0x12, 0x66, 0x63, 0x0b, 0x66, + 0x12, 0xbe, 0xf7, 0x7d, 0x62, 0xb1, 0x37, 0xb1, 0xa7, 0x15, 0xed, 0x0d, 0xd2, 0x7d, 0x35, 0x77, + 0x69, 0xf6, 0xb6, 0x61, 0xf2, 0x5e, 0x32, 0x3e, 0xb3, 0x01, 0xf3, 0xcd, 0xf4, 0xa9, 0xff, 0x87, + 0x3a, 0x0e, 0x19, 0xf5, 0x70, 0x2c, 0x58, 0x4f, 0xdc, 0xd0, 0x9b, 0xc9, 0xcc, 0xc9, 0xc6, 0xf5, + 0x86, 0x44, 0x98, 0x09, 0xd4, 0x78, 0x0c, 0xb5, 0x6f, 0x5b, 0xf6, 0xfe, 0xf3, 0xff, 0x1c, 0xe3, + 0x1d, 0xa8, 0xae, 0x53, 0xfc, 0x34, 0x23, 0xbc, 0x9e, 0x12, 0xae, 0x40, 0x95, 0x4f, 0x37, 0xc5, + 0x86, 0x52, 0x36, 0x31, 0x07, 0xf9, 0x43, 0xa6, 0x88, 0x1b, 0x0f, 0xe0, 0x64, 0x3b, 0x9d, 0x79, + 0x5b, 0x38, 0xa3, 0xba, 0x91, 0x52, 0xad, 0x42, 0x25, 0xc0, 0x8a, 0x68, 0x3e, 0x25, 0xca, 0xcd, + 0xd7, 0x8f, 0x62, 0x4c, 0xcd, 0x4a, 0x80, 0x0d, 0x0c, 0xa7, 0x33, 0xb2, 0xc7, 0xbe, 0xd5, 0xf3, + 0xbd, 0x98, 0xc5, 0x19, 0xe7, 0x46, 0xca, 0xf9, 0x1e, 0x4c, 0x46, 0x49, 0x5c, 0x51, 0x5f, 0x2c, + 0xa3, 0x4e, 0x49, 0xcc, 0x0c, 0x6f, 0x7c, 0xa2, 0x01, 0x2a, 0xea, 0xe8, 0xab, 0x49, 0x87, 0x2f, + 0xc1, 0x89, 0x04, 0xdc, 0xf1, 0x1c, 0x41, 0x5f, 0x35, 0x21, 0x69, 0xda, 0x74, 0xf4, 0xbb, 0xa9, + 0x8f, 0x5b, 0x30, 0x91, 0xb4, 0x2b, 0x1b, 0x0b, 0xa3, 0x6c, 0x98, 0x29, 0xda, 0x78, 0x02, 0x33, + 0x99, 0x87, 0x6d, 0x6a, 0xd9, 0xfb, 0xb9, 0x17, 0xfd, 0x46, 0x2a, 0x70, 0x03, 0xc6, 0x99, 0x08, + 0x16, 0xfa, 0x35, 0x47, 0x2f, 0x1f, 0x37, 0x15, 0xd2, 0x88, 0x60, 0x7a, 0x80, 0x5a, 0x37, 0x92, + 0x77, 0x3b, 0x0f, 0x13, 0x02, 0x95, 0xbd, 0x58, 0x5d, 0xd4, 0x37, 0x1d, 0xfd, 0xeb, 0xa9, 0x68, + 0x0b, 0x6a, 0xa2, 0x51, 0x69, 0x9e, 0x1f, 0xaa, 0x69, 0x4a, 0x9c, 0xf1, 0x47, 0x0d, 0xea, 0x5b, + 0x98, 0x51, 0xcf, 0xce, 0xbd, 0xc4, 0xef, 0xb5, 0xdc, 0x68, 0x9a, 0x8e, 0xf9, 0xda, 0x6f, 0x77, + 0x76, 0xc8, 0xb3, 0x4e, 0xec, 0x3d, 0x97, 0xe3, 0xa1, 0x66, 0x9e, 0x92, 0xcd, 0x77, 0xc9, 0xb3, + 0xb6, 0xf7, 0x1c, 0xa3, 0x35, 0x98, 0x8d, 0x31, 0x3d, 0xc0, 0xb4, 0x13, 0x33, 0x8b, 0xb2, 0x0e, + 0xf3, 0x82, 0x64, 0xe2, 0x4f, 0xcb, 0x40, 0x9b, 0xb7, 0x6f, 0x7b, 0x01, 0x46, 0x4d, 0x38, 0xad, + 0xb0, 0x76, 0x97, 0x52, 0x1c, 0x2a, 0xf4, 0x98, 0x40, 0x2b, 0x9a, 0x75, 0x19, 0x11, 0xf8, 0xcb, + 0x70, 0x4a, 0xe1, 0xbb, 0x91, 0x40, 0x56, 0x05, 0xf2, 0xa4, 0x6c, 0xfc, 0x48, 0xb4, 0x19, 0x0d, + 0xa8, 0x3e, 0xf6, 0x42, 0x37, 0x7b, 0x89, 0x85, 0xf4, 0x1d, 0x10, 0x54, 0x23, 0x12, 0x26, 0xcb, + 0xbc, 0x28, 0x1b, 0xdf, 0x82, 0xfa, 0x03, 0xda, 0x8b, 0x18, 0x89, 0xf5, 0x0b, 0x49, 0x86, 0x11, + 0x54, 0x77, 0x29, 0x09, 0x12, 0x1c, 0x2f, 0xeb, 0xf3, 0x29, 0xcb, 0x14, 0x54, 0x18, 0x51, 0xb1, + 0x8a, 0xdc, 0xa5, 0xb6, 0xa3, 0x1e, 0xd9, 0x08, 0x89, 0xed, 0x60, 0x41, 0x12, 0x75, 0x43, 0x49, + 0x42, 0x68, 0x46, 0x42, 0xa8, 0x22, 0x89, 0x58, 0x09, 0xc9, 0x1f, 0x34, 0x00, 0xb9, 0x29, 0x78, + 0xe1, 0x2e, 0xd1, 0x97, 0x12, 0x2b, 0x67, 0x61, 0x3c, 0x14, 0xcd, 0x02, 0x5b, 0x31, 0x55, 0x4d, + 0xff, 0x59, 0xd6, 0x33, 0xeb, 0x50, 0xdb, 0xb5, 0x6c, 0x31, 0x89, 0xc6, 0x56, 0x4f, 0xdc, 0x68, + 0x34, 0x07, 0xb6, 0xf0, 0x66, 0xc6, 0xdb, 0x94, 0x8f, 0x34, 0xdf, 0xe7, 0x78, 0xbe, 0x96, 0xf4, + 0x4c, 0xf9, 0xac, 0x7e, 0x0b, 0x20, 0x6b, 0x3c, 0xee, 0xee, 0x70, 0xbb, 0x72, 0x4b, 0x33, 0x6e, + 0xc2, 0xc4, 0x16, 0xf1, 0x7e, 0x64, 0x79, 0x41, 0x6e, 0xe9, 0xe8, 0x5b, 0x5e, 0xf7, 0xbd, 0xdd, + 0x5d, 0xe9, 0x6e, 0xd2, 0x94, 0x15, 0xde, 0x49, 0xdf, 0x23, 0xcc, 0x19, 0xd2, 0x49, 0x4f, 0x09, + 0x75, 0x92, 0xbc, 0xf1, 0xb2, 0xf1, 0x2e, 0x9c, 0xba, 0xe3, 0x33, 0x4c, 0x43, 0x8b, 0xe1, 0x87, + 0xc4, 0x25, 0xc3, 0x3a, 0xd7, 0x62, 0x7b, 0x69, 0xe7, 0x5a, 0x6c, 0xcf, 0x58, 0x81, 0xd9, 0x76, + 0x44, 0xb1, 0xe5, 0xc4, 0x7b, 0x1e, 0x65, 0xa6, 0x15, 0x3a, 0x24, 0xb7, 0xfd, 0x67, 0x9b, 0xc7, + 0x65, 0x98, 0xca, 0xe1, 0xee, 0xf8, 0x7e, 0x19, 0xe8, 0xf3, 0x1a, 0x80, 0x89, 0x6d, 0xcc, 0x98, + 0xc5, 0x08, 0xd5, 0x5f, 0x6a, 0xb9, 0xe1, 0x12, 0x63, 0x2c, 0x1d, 0x8f, 0x99, 0xa2, 0x8c, 0xae, + 0xc1, 0x4c, 0x60, 0x79, 0x61, 0xc7, 0x0b, 0x5d, 0x8a, 0x1d, 0x0f, 0x87, 0x2c, 0x16, 0xa9, 0xab, + 0x9a, 0xd3, 0xbc, 0x7d, 0x33, 0x6b, 0x46, 0x37, 0xe1, 0x4c, 0x8c, 0x6d, 0x12, 0x3a, 0x16, 0xed, + 0xf5, 0xe1, 0xc7, 0x04, 0x7e, 0x2e, 0x0d, 0xe6, 0x1f, 0x9a, 0x83, 0x5a, 0xcc, 0x70, 0x14, 0x8b, + 0x29, 0x50, 0x35, 0x65, 0x45, 0xff, 0x5d, 0x25, 0x9f, 0x77, 0xe6, 0x31, 0x1f, 0xab, 0x7c, 0xc8, + 0x0a, 0x1f, 0x4e, 0x11, 0x26, 0x91, 0x8f, 0x95, 0x19, 0x55, 0x43, 0x3a, 0x4c, 0x04, 0x16, 0xdd, + 0x77, 0xc8, 0xd3, 0x50, 0x4d, 0xbf, 0xb4, 0x9e, 0x97, 0x12, 0x3d, 0x28, 0x2a, 0xe8, 0xc3, 0x92, + 0x17, 0xac, 0x89, 0x01, 0xb8, 0x52, 0x18, 0x80, 0x59, 0xd6, 0x9a, 0xd9, 0x3b, 0x14, 0x13, 0xf1, + 0x83, 0x61, 0x89, 0x18, 0x7f, 0x23, 0xde, 0xf2, 0x84, 0x25, 0x9d, 0x54, 0xcf, 0x3a, 0x49, 0xff, + 0x42, 0x03, 0xc8, 0x30, 0x1c, 0x12, 0x5a, 0x41, 0x92, 0x31, 0x51, 0xe6, 0x89, 0xf9, 0x71, 0xd7, + 0x0a, 0x99, 0xc7, 0x7a, 0x6a, 0xe8, 0xa7, 0x75, 0x9e, 0xcc, 0x00, 0xb3, 0x3d, 0xe2, 0xa8, 0x94, + 0xa9, 0x1a, 0x6f, 0x77, 0x71, 0xe8, 0x60, 0xaa, 0xd6, 0x27, 0x55, 0x13, 0x49, 0xee, 0xfa, 0xcc, + 0xe3, 0xe9, 0xaf, 0x2d, 0x6b, 0xab, 0x13, 0x66, 0x5a, 0xe7, 0xda, 0xfb, 0x5e, 0xe8, 0xcc, 0x8f, + 0x4b, 0x6d, 0x5e, 0xe6, 0x4b, 0x29, 0xf7, 0xd0, 0xb1, 0x42, 0xa7, 0x93, 0x9a, 0xa8, 0xcb, 0xa5, + 0x94, 0x07, 0xee, 0x84, 0xce, 0x87, 0xaa, 0xd9, 0xf8, 0xdb, 0x04, 0x8c, 0xb5, 0x37, 0x1f, 0xe9, + 0xff, 0xac, 0x40, 0xf5, 0x3b, 0xc4, 0x0b, 0x75, 0x9a, 0x1b, 0x9d, 0x94, 0x64, 0x8b, 0x19, 0x2f, + 0xa3, 0x06, 0x54, 0x23, 0x8c, 0xa9, 0x78, 0xa3, 0xfc, 0xe6, 0x90, 0x24, 0xb6, 0xbd, 0xf9, 0xa8, + 0xf9, 0x18, 0x63, 0x6a, 0x0a, 0x18, 0x5f, 0xfb, 0x03, 0xeb, 0x59, 0xc7, 0x27, 0x6e, 0x27, 0x39, + 0xa2, 0x8c, 0xc9, 0xb5, 0x3f, 0xb0, 0x9e, 0x3d, 0x24, 0xae, 0x3a, 0x95, 0xe8, 0x1f, 0xe7, 0xb7, + 0x1f, 0xfe, 0x64, 0xb2, 0x26, 0x8d, 0x50, 0x90, 0x38, 0x74, 0x11, 0x80, 0x17, 0x3a, 0x36, 0x3f, + 0x73, 0x0b, 0x5f, 0x35, 0x73, 0x92, 0xb7, 0x88, 0x43, 0xb8, 0xfe, 0xb9, 0x06, 0xb5, 0x8d, 0x03, + 0xd5, 0x49, 0xff, 0xee, 0xeb, 0xa4, 0xe6, 0xc6, 0xbe, 0x92, 0xb9, 0xea, 0xa0, 0xb9, 0x7f, 0x68, + 0x30, 0x79, 0x97, 0x12, 0xcb, 0xb1, 0xad, 0x98, 0xe9, 0xf7, 0x47, 0x25, 0x7e, 0x4d, 0x7e, 0x67, + 0x54, 0x06, 0x4e, 0x52, 0x79, 0xe1, 0xad, 0xd8, 0x95, 0x1f, 0x35, 0xe9, 0xca, 0xa3, 0xff, 0x62, + 0xe4, 0xdb, 0xbf, 0x01, 0x67, 0x9a, 0xa9, 0xb1, 0xe3, 0x65, 0xea, 0x1c, 0xd4, 0xbd, 0xb8, 0xe3, + 0x7b, 0x07, 0x72, 0xab, 0x9d, 0x30, 0xc7, 0xbd, 0xf8, 0xa1, 0x77, 0x80, 0xf5, 0xab, 0x50, 0x33, + 0x09, 0x09, 0xe2, 0xfe, 0x85, 0x9e, 0xdb, 0x49, 0x17, 0x7a, 0x51, 0xd1, 0x7f, 0xab, 0x01, 0xdc, + 0xf3, 0x62, 0x9b, 0x84, 0x21, 0xb6, 0xff, 0xc7, 0xfb, 0xf1, 0xff, 0x60, 0x6c, 0x2b, 0x76, 0xb9, + 0x33, 0x86, 0x9f, 0xb1, 0xc4, 0x19, 0x2f, 0xe7, 0xb6, 0xe1, 0x8a, 0x58, 0x3f, 0x92, 0x6d, 0xf8, + 0x3d, 0xa8, 0x6d, 0x50, 0x4a, 0x28, 0x3f, 0x94, 0x79, 0x71, 0x07, 0xf3, 0xb2, 0x78, 0x70, 0xc2, + 0xac, 0x7b, 0xb1, 0x0c, 0x9d, 0x83, 0x3a, 0xa6, 0xb4, 0x93, 0xf4, 0xd1, 0xa4, 0x39, 0x8e, 0x29, + 0xdd, 0x8a, 0x5d, 0xfd, 0x09, 0x54, 0xb9, 0xbb, 0xd2, 0x75, 0x67, 0x0e, 0x6a, 0x36, 0xf1, 0x09, + 0x4d, 0xf6, 0x5b, 0x51, 0x41, 0x57, 0x61, 0x7a, 0xd7, 0x3a, 0x20, 0xd4, 0x63, 0xb8, 0xa3, 0xfc, + 0xc8, 0x89, 0x38, 0x95, 0x34, 0xcb, 0xbd, 0x5e, 0x7f, 0x02, 0xf5, 0x75, 0x12, 0x0a, 0xeb, 0x49, + 0x52, 0xb5, 0xe3, 0x25, 0x75, 0x09, 0x4e, 0x84, 0xa4, 0x13, 0x60, 0x66, 0x39, 0x16, 0xb3, 0x84, + 0xfc, 0x84, 0x09, 0x21, 0xd9, 0x52, 0x2d, 0x37, 0xfe, 0xae, 0x43, 0xbd, 0x8d, 0xe9, 0x81, 0x67, + 0x63, 0x44, 0x61, 0x4a, 0x1d, 0x9e, 0x36, 0x42, 0x9b, 0x17, 0xd0, 0x62, 0x81, 0x5f, 0x01, 0x9a, + 0x72, 0x3b, 0x5d, 0x1a, 0x1a, 0x57, 0xbb, 0xec, 0xd2, 0x27, 0x7f, 0xfa, 0xeb, 0x2f, 0x2b, 0xe7, + 0x8d, 0x39, 0x71, 0xe3, 0xb0, 0x2f, 0x83, 0x2d, 0x2c, 0xe9, 0x6f, 0x6b, 0x6b, 0x39, 0xcd, 0x7b, + 0xf8, 0xbf, 0xaa, 0xe9, 0xe0, 0x54, 0xd3, 0xcb, 0x1f, 0xf1, 0xd0, 0xa5, 0x02, 0x5f, 0x16, 0x6c, + 0x8a, 0xc3, 0x9f, 0x6e, 0x8c, 0x82, 0xc8, 0x23, 0xa0, 0x31, 0x27, 0x54, 0xa7, 0x8c, 0x49, 0xa1, + 0xca, 0xa2, 0x1e, 0xe1, 0x52, 0xdb, 0xf2, 0xf8, 0x8a, 0x2e, 0x14, 0x18, 0x78, 0xb3, 0x7a, 0xa3, + 0x85, 0xf2, 0xa0, 0x7a, 0x9d, 0x59, 0x41, 0x7c, 0x02, 0x49, 0xe2, 0x88, 0xb3, 0xed, 0xe5, 0x3e, + 0x67, 0xd1, 0x72, 0xe1, 0xe9, 0x34, 0xa6, 0xf8, 0x2f, 0x8d, 0x40, 0x28, 0x91, 0xb3, 0x42, 0x64, + 0x06, 0x4d, 0x09, 0x91, 0xf4, 0x0b, 0x15, 0x7d, 0xac, 0x3e, 0x71, 0x51, 0xd1, 0xa3, 0x68, 0x57, + 0x0a, 0x17, 0x87, 0x44, 0x15, 0x3b, 0x12, 0xec, 0x27, 0x11, 0x08, 0xf6, 0x3d, 0x41, 0xb8, 0x2d, + 0x3f, 0x75, 0x4b, 0x32, 0xc3, 0x9b, 0x87, 0x66, 0x46, 0x04, 0x4b, 0x33, 0xc3, 0xbf, 0x7e, 0x51, + 0x37, 0x7f, 0xee, 0x2e, 0xe9, 0xda, 0xdc, 0xe1, 0x59, 0x2a, 0x18, 0x47, 0x9f, 0xaf, 0x8d, 0x65, + 0xa1, 0xa3, 0xa3, 0x79, 0xa1, 0x13, 0xa6, 0xf1, 0xd6, 0x0b, 0x59, 0x3e, 0x44, 0x7e, 0xfe, 0x2c, + 0x59, 0x22, 0xdb, 0x77, 0xb4, 0x29, 0x97, 0xcd, 0x41, 0x94, 0xec, 0x39, 0x21, 0x3b, 0x8b, 0xa6, + 0x85, 0x2c, 0xcd, 0xf8, 0x9d, 0xec, 0x8c, 0x8e, 0x8a, 0xb3, 0x21, 0x09, 0x29, 0xa5, 0xe5, 0xe1, + 0x00, 0xa5, 0x73, 0x46, 0xe8, 0x4c, 0xa3, 0x53, 0x42, 0x27, 0x48, 0x98, 0x7f, 0xae, 0x95, 0x1c, + 0xb7, 0xd1, 0x6a, 0x71, 0xc5, 0x19, 0xc4, 0x28, 0xe1, 0x6b, 0xc7, 0x40, 0xf6, 0xcf, 0x58, 0x74, + 0x4e, 0x38, 0x88, 0x33, 0x58, 0x8b, 0x4a, 0xd5, 0xc3, 0xc1, 0x13, 0x3d, 0x7a, 0x7b, 0x14, 0xfb, + 0x1d, 0xdf, 0x57, 0x26, 0x56, 0x8e, 0x82, 0x29, 0x07, 0x0b, 0xc2, 0xc1, 0x59, 0x34, 0x57, 0x70, + 0x60, 0xf9, 0x3e, 0x1f, 0xab, 0xfc, 0xfb, 0xa6, 0x64, 0xac, 0xf2, 0xe6, 0xa1, 0x63, 0x55, 0x04, + 0x4b, 0xc7, 0xea, 0x53, 0xce, 0xd6, 0x1b, 0xf8, 0x0c, 0x42, 0x57, 0x0a, 0x0c, 0x7d, 0x71, 0xa5, + 0xf3, 0xf6, 0x11, 0x28, 0x25, 0x78, 0x41, 0x08, 0x9e, 0x41, 0xa7, 0xe5, 0x5d, 0x6f, 0x02, 0x69, + 0xf8, 0x5c, 0xa9, 0xdb, 0x7f, 0x49, 0x84, 0x2e, 0x17, 0xd3, 0x94, 0x0b, 0x2b, 0xe1, 0x2b, 0xa3, + 0x41, 0x4a, 0x57, 0x17, 0xba, 0x73, 0x08, 0xc9, 0x4c, 0xa6, 0x88, 0x56, 0x80, 0xd1, 0x4b, 0xad, + 0xf4, 0x3e, 0x09, 0xad, 0x8d, 0x60, 0x4e, 0x51, 0xca, 0xc5, 0x3b, 0xc7, 0xc2, 0x2a, 0x33, 0x97, + 0x84, 0x99, 0x0b, 0xe8, 0xfc, 0xa0, 0x99, 0xf4, 0xee, 0x09, 0xfd, 0xa6, 0xf4, 0xee, 0x09, 0x5d, + 0x3b, 0x86, 0x8c, 0x72, 0x74, 0x1c, 0xf7, 0x89, 0xa1, 0x96, 0x30, 0x74, 0x0d, 0x5d, 0x1d, 0x6a, + 0xa8, 0xf5, 0x22, 0x77, 0xd5, 0x75, 0x88, 0x7e, 0xaa, 0x15, 0xaf, 0xa5, 0xd0, 0xd5, 0x11, 0x8a, + 0x12, 0xa2, 0xac, 0xad, 0x1e, 0x0d, 0x54, 0xc6, 0x16, 0x85, 0xb1, 0x79, 0x74, 0x76, 0xd0, 0x98, + 0xbc, 0xc2, 0x42, 0x9f, 0x6a, 0x85, 0x3b, 0x2c, 0xb4, 0x72, 0x14, 0xbb, 0x72, 0x71, 0xa4, 0xdd, + 0xc4, 0xc4, 0x35, 0x61, 0xe2, 0x32, 0xba, 0x54, 0x6e, 0xa2, 0xf5, 0x22, 0xb9, 0x29, 0x3b, 0x44, + 0x3f, 0x4c, 0xef, 0xb7, 0x4a, 0x0e, 0x0c, 0x2a, 0x32, 0xf4, 0xc0, 0x90, 0xc4, 0x95, 0xac, 0xda, + 0xba, 0xd1, 0x49, 0xb9, 0x00, 0x2a, 0xda, 0x38, 0xff, 0xcb, 0xa0, 0x64, 0x4d, 0xcf, 0x82, 0x43, + 0xd7, 0xf4, 0x1c, 0xa4, 0x34, 0xcd, 0xb6, 0x8c, 0x37, 0xbc, 0xd0, 0x6e, 0xbd, 0xd8, 0xc7, 0xbd, + 0x43, 0xf4, 0x6b, 0xad, 0xe4, 0x6f, 0x42, 0xc9, 0xa2, 0x5b, 0xc0, 0x0c, 0x5d, 0x74, 0x8b, 0xc8, + 0xd2, 0xa1, 0x28, 0x77, 0xb2, 0x46, 0x8c, 0x59, 0xc3, 0xdb, 0x6d, 0xec, 0x08, 0xa4, 0xf4, 0xd4, + 0x7a, 0x21, 0x6e, 0x87, 0x0e, 0xd1, 0xaf, 0xb4, 0x92, 0x7f, 0x10, 0x25, 0xde, 0x0a, 0x98, 0xa1, + 0xde, 0x8a, 0x48, 0xe5, 0x6d, 0x4d, 0x78, 0xbb, 0x62, 0x2c, 0xc9, 0x23, 0x1c, 0xee, 0x35, 0x84, + 0x87, 0x46, 0x2c, 0x80, 0xdc, 0xa5, 0xf4, 0xc6, 0x8f, 0x58, 0x2f, 0xb5, 0x92, 0x5f, 0x19, 0x47, + 0xda, 0xba, 0x7f, 0x6c, 0x5b, 0xf7, 0x33, 0x5b, 0x57, 0x85, 0xad, 0x4b, 0x68, 0x88, 0x2d, 0x37, + 0xb1, 0x85, 0x3e, 0xd3, 0x8a, 0xbf, 0x43, 0x4a, 0x66, 0xed, 0x20, 0x64, 0xe8, 0xac, 0x2d, 0x00, + 0xfb, 0x27, 0x8c, 0xb1, 0x38, 0x60, 0x68, 0x97, 0xe3, 0xfa, 0xd3, 0xf4, 0xa9, 0x56, 0xfc, 0xa5, + 0x72, 0x94, 0xa5, 0xfb, 0xc7, 0xb5, 0x94, 0xcb, 0xd1, 0x8a, 0xb0, 0xb4, 0x8c, 0xca, 0x2d, 0x65, + 0x29, 0x62, 0xf9, 0xbf, 0x81, 0x25, 0xd3, 0x2b, 0x0b, 0x0e, 0x9d, 0x5e, 0x39, 0x48, 0xff, 0xa6, + 0x67, 0xcc, 0x08, 0x71, 0x6c, 0xef, 0x11, 0xde, 0x37, 0xd8, 0x0a, 0x6e, 0x6b, 0x6b, 0xab, 0xda, + 0x75, 0x0d, 0xfd, 0x44, 0x1b, 0xfc, 0x7f, 0x58, 0x72, 0x92, 0xe8, 0x07, 0x0c, 0x3d, 0x49, 0x0c, + 0xc0, 0x94, 0x85, 0x8b, 0xc2, 0xc2, 0x39, 0x74, 0x46, 0x7e, 0x07, 0xe0, 0x98, 0x35, 0xf8, 0x61, + 0x42, 0xf9, 0xb8, 0xae, 0xdd, 0x7d, 0xf7, 0x8b, 0x57, 0x8b, 0xda, 0x97, 0xaf, 0x16, 0xb5, 0xbf, + 0xbc, 0x5a, 0xd4, 0x3e, 0x7b, 0xbd, 0xf8, 0xd6, 0x97, 0xaf, 0x17, 0xdf, 0xfa, 0xf3, 0xeb, 0xc5, + 0xb7, 0xbe, 0xbf, 0xd0, 0xf5, 0x19, 0xc5, 0xcd, 0x00, 0xb7, 0x94, 0x54, 0x2b, 0xda, 0x77, 0x5b, + 0x4a, 0x6e, 0x67, 0x5c, 0xfc, 0x45, 0xbd, 0xf9, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x28, 0x41, + 0xbc, 0x11, 0xe3, 0x1d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -8104,6 +8130,11 @@ func (m *SIO_Join_Output) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.PeerCount != 0 { + i = encodeVarintCalcapi(dAtA, i, uint64(m.PeerCount)) + i-- + dAtA[i] = 0x10 + } if len(m.Peers) > 0 { for iNdEx := len(m.Peers) - 1; iNdEx >= 0; iNdEx-- { { @@ -8141,6 +8172,11 @@ func (m *SIO_Join_Event) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.PeerCount != 0 { + i = encodeVarintCalcapi(dAtA, i, uint64(m.PeerCount)) + i-- + dAtA[i] = 0x20 + } if len(m.Peers) > 0 { for iNdEx := len(m.Peers) - 1; iNdEx >= 0; iNdEx-- { { @@ -8427,6 +8463,11 @@ func (m *SIO_Disconnect_Event) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.PeerCount != 0 { + i = encodeVarintCalcapi(dAtA, i, uint64(m.PeerCount)) + i-- + dAtA[i] = 0x20 + } if len(m.Peers) > 0 { for iNdEx := len(m.Peers) - 1; iNdEx >= 0; iNdEx-- { { @@ -9655,6 +9696,9 @@ func (m *SIO_Join_Output) Size() (n int) { n += 1 + l + sovCalcapi(uint64(l)) } } + if m.PeerCount != 0 { + n += 1 + sovCalcapi(uint64(m.PeerCount)) + } return n } @@ -9678,6 +9722,9 @@ func (m *SIO_Join_Event) Size() (n int) { n += 1 + l + sovCalcapi(uint64(l)) } } + if m.PeerCount != 0 { + n += 1 + sovCalcapi(uint64(m.PeerCount)) + } return n } @@ -9793,6 +9840,9 @@ func (m *SIO_Disconnect_Event) Size() (n int) { n += 1 + l + sovCalcapi(uint64(l)) } } + if m.PeerCount != 0 { + n += 1 + sovCalcapi(uint64(m.PeerCount)) + } return n } @@ -16268,6 +16318,25 @@ func (m *SIO_Join_Output) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PeerCount", wireType) + } + m.PeerCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCalcapi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PeerCount |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipCalcapi(dAtA[iNdEx:]) @@ -16423,6 +16492,25 @@ func (m *SIO_Join_Event) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PeerCount", wireType) + } + m.PeerCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCalcapi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PeerCount |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipCalcapi(dAtA[iNdEx:]) @@ -17173,6 +17261,25 @@ func (m *SIO_Disconnect_Event) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PeerCount", wireType) + } + m.PeerCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCalcapi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PeerCount |= 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 843367b7..6dd8f305 100644 --- a/pkg/calcapi/socketio.go +++ b/pkg/calcapi/socketio.go @@ -2,45 +2,66 @@ package calcapi import ( "encoding/json" + "fmt" "time" engineio "github.com/googollee/go-engine.io" socketio "github.com/googollee/go-socket.io" "github.com/pkg/errors" "go.uber.org/zap" + "moul.io/godev" ) const socketioRoomLogSize int = 50 func (svc *svc) sioOnConnect(s socketio.Conn) error { s.SetContext(&SIO_Context{NoMetadata: true}) - svc.sio.connectedPeers++ svc.sio.logger.Info( "connect", zap.String("id", s.ID()), - zap.Int("peers", svc.sio.connectedPeers), ) return nil } -func (svc *svc) sioOnError(err error) { - svc.sio.logger.Warn("error", zap.Error(err)) +func (svc *svc) sioOnError(s socketio.Conn, err error) { + svc.sio.logger.Warn( + "error", + zap.String("id", s.ID()), + zap.Error(err), + ) + s.Close() } func (svc *svc) sioOnDisconnect(s socketio.Conn, reason string) { - svc.sio.connectedPeers-- svc.sio.logger.Info( "disconnect", zap.String("id", s.ID()), - zap.Int("peers", svc.sio.connectedPeers), zap.String("reason", reason), + zap.Strings("rooms", s.Rooms()), ) + fmt.Println("onDisconnect.Lock") + defer fmt.Println("onDisconnect.Unlock") + svc.sio.mutex.Lock() + defer svc.sio.mutex.Unlock() + + if s == nil || s.Context() == nil { + svc.sio.logger.Warn("socket is nil", zap.Any("s", s)) + } context := s.Context().(*SIO_Context) - for _, room := range s.Rooms() { - broadcast := SIO_Disconnect_Event{Room: room, Peer: context.Peer, Peers: svc.peersForRoom(room)} - out, _ := json.Marshal(broadcast) - go svc.sio.server.BroadcastToRoom(room, "event:disconnect", string(out)) + for room, roomPeers := range svc.sio.roomPeers { + if _, ok := roomPeers[s.ID()]; !ok { + continue + } + delete(svc.sio.roomPeers[room], s.ID()) + broadcast := SIO_Disconnect_Event{ + Room: room, + Peer: context.Peer, + Peers: svc.peersForRoom(room), + //PeerCount: int32(svc.sio.server.RoomLen(room)), + } + go svc.broadcastToRoom(room, "event:disconnect", broadcast) + s.Leave(room) } } @@ -63,7 +84,9 @@ func (svc *svc) onEventRooms(s socketio.Conn) *SIO_Rooms_Output { } func (svc *svc) onEventJoin(s socketio.Conn, in *SIO_Join_Input) (*SIO_Join_Output, error) { + context := s.Context().(*SIO_Context) + svc.sio.logger.Debug( "join", zap.String("room", in.Room), @@ -78,18 +101,20 @@ func (svc *svc) onEventJoin(s socketio.Conn, in *SIO_Join_Input) (*SIO_Join_Outp context.Peer = in.Peer s.SetContext(context) - broadcast := SIO_Join_Event{Room: in.Room, Peer: in.Peer, Peers: svc.peersForRoom(in.Room)} - out, _ := json.Marshal(broadcast) - go svc.sio.server.BroadcastToRoom(in.Room, "event:join", string(out)) + fmt.Println("onEventJoin.Lock") + defer fmt.Println("onEventJoin.Unlock") + svc.sio.mutex.Lock() + defer svc.sio.mutex.Unlock() - ret := SIO_Join_Output{ - Peers: broadcast.Peers, + // update room peers stats + if _, ok := svc.sio.roomPeers[in.Room]; !ok { + svc.sio.roomPeers[in.Room] = make(map[string]socketio.Conn) } + svc.sio.roomPeers[in.Room][s.ID()] = s + // emit old logs 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) { @@ -101,12 +126,56 @@ func (svc *svc) onEventJoin(s socketio.Conn, in *SIO_Join_Input) (*SIO_Join_Outp } } } + + fmt.Println(godev.PrettyJSON(svc.sio.roomPeers)) + + // broadcast join event to the room + broadcast := SIO_Join_Event{ + Room: in.Room, + Peer: in.Peer, + Peers: svc.peersForRoom(in.Room), + //PeerCount: int32(svc.sio.server.RoomLen(in.Room)), + } + + go svc.broadcastToRoom(in.Room, "event:join", broadcast) + + // reply + ret := SIO_Join_Output{ + Peers: broadcast.Peers, + } + return &ret, nil } +func (svc *svc) broadcastToRoom(room string, event string, data interface{}) { + + svc.sio.logger.Debug( + "broadcast to room", + zap.String("room", room), + zap.String("event", event), + //zap.Int("room-len", svc.sio.server.RoomLen(room)), + zap.Any("data", data), + ) + out, _ := json.Marshal(data) + + svc.sio.server.BroadcastToRoom(room, event, string(out)) + +} + func (svc *svc) peersForRoom(room string) []*SIO_Peer { - // FIXME: todo - return []*SIO_Peer{{Name: "foo"}, {Name: "bar"}} + peers := []*SIO_Peer{} + + roomPeers, ok := svc.sio.roomPeers[room] + if !ok { + return peers + } + + for _, peer := range roomPeers { + context := peer.Context().(*SIO_Context) + peers = append(peers, context.Peer) + } + + return peers } func (svc *svc) onEventBroadcast(s socketio.Conn, in *SIO_Broadcast_Input) (*SIO_Broadcast_Output, error) { @@ -119,13 +188,19 @@ func (svc *svc) onEventBroadcast(s socketio.Conn, in *SIO_Broadcast_Input) (*SIO zap.String("id", s.ID()), ) - broadcast := SIO_Broadcast_Event{Room: in.Room, Msg: in.Msg, Peer: context.Peer, IsLive: true} - out, _ := json.Marshal(broadcast) - go svc.sio.server.BroadcastToRoom(in.Room, "event:broadcast", string(out)) + broadcast := SIO_Broadcast_Event{ + Room: in.Room, + Msg: in.Msg, + Peer: context.Peer, + IsLive: true, + } + go svc.broadcastToRoom(in.Room, "event:broadcast", broadcast) ret := SIO_Broadcast_Output{} // store log + fmt.Println("onEventBroadcast.Lock") + defer fmt.Println("onEventBroadcast.Unlock") svc.sio.mutex.Lock() defer svc.sio.mutex.Unlock() if _, ok := svc.sio.logs[in.Room]; !ok { @@ -151,6 +226,7 @@ func (svc *svc) SocketIOServer() (*socketio.Server, error) { svc.sio.logger = svc.opts.Logger.Named("sio") svc.sio.server = server svc.sio.logs = make(map[string][]SIO_Broadcast_Event) + svc.sio.roomPeers = make(map[string]map[string]socketio.Conn) // core events server.OnConnect("/", svc.sioOnConnect) diff --git a/pkg/calcapi/svc.go b/pkg/calcapi/svc.go index 7e722428..d907f156 100644 --- a/pkg/calcapi/svc.go +++ b/pkg/calcapi/svc.go @@ -26,11 +26,11 @@ type svc struct { startTime time.Time db *gorm.DB sio struct { - server *socketio.Server - logger *zap.Logger - connectedPeers int - logs map[string][]SIO_Broadcast_Event - mutex sync.Mutex + server *socketio.Server + logger *zap.Logger + roomPeers map[string]map[string]socketio.Conn + logs map[string][]SIO_Broadcast_Event + mutex sync.Mutex } }