filters
This commit is contained in:
parent
74e8d2e019
commit
5728430ada
6 changed files with 254 additions and 140 deletions
|
|
@ -31,7 +31,7 @@ type TalkgroupFilter struct {
|
|||
talkgroups map[Talkgroup]bool
|
||||
}
|
||||
|
||||
func TalkgroupFilterFromPB(p *pb.Filter) *TalkgroupFilter {
|
||||
func TalkgroupFilterFromPB(ctx context.Context, p *pb.Filter) (*TalkgroupFilter, error) {
|
||||
tgf := &TalkgroupFilter{
|
||||
TalkgroupTagsAll: p.TalkgroupTagsAll,
|
||||
TalkgroupTagsAny: p.TalkgroupTagsAny,
|
||||
|
|
@ -42,7 +42,7 @@ func TalkgroupFilterFromPB(p *pb.Filter) *TalkgroupFilter {
|
|||
tgf.Talkgroups = make([]Talkgroup, l)
|
||||
for i, t := range p.Talkgroups {
|
||||
tgf.Talkgroups[i] = Talkgroup{
|
||||
System: uint32(t.System),
|
||||
System: uint32(t.System),
|
||||
Talkgroup: uint32(t.Talkgroup),
|
||||
}
|
||||
}
|
||||
|
|
@ -52,13 +52,13 @@ func TalkgroupFilterFromPB(p *pb.Filter) *TalkgroupFilter {
|
|||
tgf.TalkgroupsNot = make([]Talkgroup, l)
|
||||
for i, t := range p.TalkgroupsNot {
|
||||
tgf.TalkgroupsNot[i] = Talkgroup{
|
||||
System: uint32(t.System),
|
||||
System: uint32(t.System),
|
||||
Talkgroup: uint32(t.Talkgroup),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return tgf
|
||||
return tgf, tgf.compile(ctx)
|
||||
}
|
||||
|
||||
func PackedTGs(tg []Talkgroup) []int64 {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
package nexus
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"sync"
|
||||
|
||||
"dynatron.me/x/stillbox/pkg/calls"
|
||||
"dynatron.me/x/stillbox/pkg/live"
|
||||
"dynatron.me/x/stillbox/pkg/pb"
|
||||
|
||||
"github.com/rs/zerolog/log"
|
||||
|
|
@ -17,8 +17,8 @@ type Client interface {
|
|||
|
||||
Connection
|
||||
|
||||
HandleCommand(*pb.Command)
|
||||
HandleMessage([]byte)
|
||||
HandleCommand(context.Context, *pb.Command)
|
||||
HandleMessage(context.Context, []byte)
|
||||
}
|
||||
|
||||
type client struct {
|
||||
|
|
@ -29,7 +29,7 @@ type client struct {
|
|||
liveState pb.LiveState
|
||||
filter *calls.TalkgroupFilter
|
||||
|
||||
nexus *Nexus
|
||||
nexus *Nexus
|
||||
}
|
||||
|
||||
type Connection interface {
|
||||
|
|
@ -48,7 +48,7 @@ func (n *Nexus) NewClient(conn Connection) Client {
|
|||
return sess
|
||||
}
|
||||
|
||||
func (c *client) HandleMessage(mesgBytes []byte) {
|
||||
func (c *client) HandleMessage(ctx context.Context, mesgBytes []byte) {
|
||||
var msg pb.Command
|
||||
err := proto.Unmarshal(mesgBytes, &msg)
|
||||
if err != nil {
|
||||
|
|
@ -56,5 +56,5 @@ func (c *client) HandleMessage(mesgBytes []byte) {
|
|||
return
|
||||
}
|
||||
|
||||
c.HandleCommand(&msg)
|
||||
c.HandleCommand(ctx, &msg)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,51 @@
|
|||
package nexus
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"dynatron.me/x/stillbox/pkg/calls"
|
||||
"dynatron.me/x/stillbox/pkg/pb"
|
||||
|
||||
"github.com/rs/zerolog/log"
|
||||
)
|
||||
|
||||
func (c *client) HandleCommand(cmd *pb.Command) {
|
||||
func (c *client) HandleCommand(ctx context.Context, cmd *pb.Command) {
|
||||
switch cc := cmd.Command.(type) {
|
||||
case *pb.Command_LiveCommand:
|
||||
c.Live(cc.LiveCommand)
|
||||
c.Live(ctx, cc.LiveCommand)
|
||||
case *pb.Command_SearchCommand:
|
||||
default:
|
||||
log.Error().Msgf("unknown command %T", cmd)
|
||||
}
|
||||
}
|
||||
|
||||
func (c *client) Live(cmd *pb.Live) {
|
||||
func (c *client) SendError(err error) {
|
||||
e := &pb.Message{
|
||||
ToClientMessage: &pb.Message_Error{
|
||||
Error: &pb.Error{
|
||||
Error: err.Error(),
|
||||
},
|
||||
},
|
||||
}
|
||||
c.Send(e)
|
||||
}
|
||||
|
||||
func (c *client) Live(ctx context.Context, cmd *pb.Live) {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
if cmd.State != nil {
|
||||
c.liveState = *cmd.State
|
||||
}
|
||||
|
||||
if cmd.Filter != nil {
|
||||
filter, err := calls.TalkgroupFilterFromPB(ctx, cmd.Filter)
|
||||
if err != nil {
|
||||
log.Error().Err(err).Msg("filter create failed")
|
||||
c.SendError(err)
|
||||
return
|
||||
}
|
||||
|
||||
c.filter = filter
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package nexus
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"net/http"
|
||||
"time"
|
||||
|
|
@ -81,11 +82,11 @@ func (wm *wsManager) serveWS(w http.ResponseWriter, r *http.Request) {
|
|||
cli := wm.NewClient(wsc)
|
||||
wm.Register(cli)
|
||||
|
||||
go wsc.readPump(wm, cli)
|
||||
go wsc.readPump(r.Context(), wm, cli)
|
||||
go wsc.writePump()
|
||||
}
|
||||
|
||||
func (conn *wsConn) readPump(reg Registry, c Client) {
|
||||
func (conn *wsConn) readPump(ctx context.Context, reg Registry, c Client) {
|
||||
defer func() {
|
||||
reg.Unregister(c)
|
||||
conn.Close()
|
||||
|
|
@ -110,7 +111,7 @@ func (conn *wsConn) readPump(reg Registry, c Client) {
|
|||
break
|
||||
}
|
||||
|
||||
go c.HandleMessage(message)
|
||||
go c.HandleMessage(ctx, message)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ type Message struct {
|
|||
// *Message_Call
|
||||
// *Message_Notification
|
||||
// *Message_Popup
|
||||
// *Message_Error
|
||||
ToClientMessage isMessage_ToClientMessage `protobuf_oneof:"toClient_message"`
|
||||
}
|
||||
|
||||
|
|
@ -143,6 +144,13 @@ func (x *Message) GetPopup() *UserPopup {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (x *Message) GetError() *Error {
|
||||
if x, ok := x.GetToClientMessage().(*Message_Error); ok {
|
||||
return x.Error
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type isMessage_ToClientMessage interface {
|
||||
isMessage_ToClientMessage()
|
||||
}
|
||||
|
|
@ -159,12 +167,18 @@ type Message_Popup struct {
|
|||
Popup *UserPopup `protobuf:"bytes,3,opt,name=popup,proto3,oneof"`
|
||||
}
|
||||
|
||||
type Message_Error struct {
|
||||
Error *Error `protobuf:"bytes,4,opt,name=error,proto3,oneof"`
|
||||
}
|
||||
|
||||
func (*Message_Call) isMessage_ToClientMessage() {}
|
||||
|
||||
func (*Message_Notification) isMessage_ToClientMessage() {}
|
||||
|
||||
func (*Message_Popup) isMessage_ToClientMessage() {}
|
||||
|
||||
func (*Message_Error) isMessage_ToClientMessage() {}
|
||||
|
||||
type Call struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
|
|
@ -339,6 +353,53 @@ func (x *UserPopup) GetMsg() string {
|
|||
return ""
|
||||
}
|
||||
|
||||
type Error struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Error string `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
|
||||
}
|
||||
|
||||
func (x *Error) Reset() {
|
||||
*x = Error{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_stillbox_proto_msgTypes[3]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *Error) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*Error) ProtoMessage() {}
|
||||
|
||||
func (x *Error) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_stillbox_proto_msgTypes[3]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use Error.ProtoReflect.Descriptor instead.
|
||||
func (*Error) Descriptor() ([]byte, []int) {
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{3}
|
||||
}
|
||||
|
||||
func (x *Error) GetError() string {
|
||||
if x != nil {
|
||||
return x.Error
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type Notification struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
|
|
@ -352,7 +413,7 @@ type Notification struct {
|
|||
func (x *Notification) Reset() {
|
||||
*x = Notification{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_stillbox_proto_msgTypes[3]
|
||||
mi := &file_stillbox_proto_msgTypes[4]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
|
@ -365,7 +426,7 @@ func (x *Notification) String() string {
|
|||
func (*Notification) ProtoMessage() {}
|
||||
|
||||
func (x *Notification) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_stillbox_proto_msgTypes[3]
|
||||
mi := &file_stillbox_proto_msgTypes[4]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
|
|
@ -378,7 +439,7 @@ func (x *Notification) ProtoReflect() protoreflect.Message {
|
|||
|
||||
// Deprecated: Use Notification.ProtoReflect.Descriptor instead.
|
||||
func (*Notification) Descriptor() ([]byte, []int) {
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{3}
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{4}
|
||||
}
|
||||
|
||||
func (x *Notification) GetDateTime() *timestamppb.Timestamp {
|
||||
|
|
@ -417,7 +478,7 @@ type Command struct {
|
|||
func (x *Command) Reset() {
|
||||
*x = Command{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_stillbox_proto_msgTypes[4]
|
||||
mi := &file_stillbox_proto_msgTypes[5]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
|
@ -430,7 +491,7 @@ func (x *Command) String() string {
|
|||
func (*Command) ProtoMessage() {}
|
||||
|
||||
func (x *Command) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_stillbox_proto_msgTypes[4]
|
||||
mi := &file_stillbox_proto_msgTypes[5]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
|
|
@ -443,7 +504,7 @@ func (x *Command) ProtoReflect() protoreflect.Message {
|
|||
|
||||
// Deprecated: Use Command.ProtoReflect.Descriptor instead.
|
||||
func (*Command) Descriptor() ([]byte, []int) {
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{4}
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{5}
|
||||
}
|
||||
|
||||
func (m *Command) GetCommand() isCommand_Command {
|
||||
|
|
@ -495,7 +556,7 @@ type Live struct {
|
|||
func (x *Live) Reset() {
|
||||
*x = Live{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_stillbox_proto_msgTypes[5]
|
||||
mi := &file_stillbox_proto_msgTypes[6]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
|
@ -508,7 +569,7 @@ func (x *Live) String() string {
|
|||
func (*Live) ProtoMessage() {}
|
||||
|
||||
func (x *Live) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_stillbox_proto_msgTypes[5]
|
||||
mi := &file_stillbox_proto_msgTypes[6]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
|
|
@ -521,7 +582,7 @@ func (x *Live) ProtoReflect() protoreflect.Message {
|
|||
|
||||
// Deprecated: Use Live.ProtoReflect.Descriptor instead.
|
||||
func (*Live) Descriptor() ([]byte, []int) {
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{5}
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{6}
|
||||
}
|
||||
|
||||
func (x *Live) GetState() LiveState {
|
||||
|
|
@ -550,7 +611,7 @@ type Talkgroup struct {
|
|||
func (x *Talkgroup) Reset() {
|
||||
*x = Talkgroup{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_stillbox_proto_msgTypes[6]
|
||||
mi := &file_stillbox_proto_msgTypes[7]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
|
@ -563,7 +624,7 @@ func (x *Talkgroup) String() string {
|
|||
func (*Talkgroup) ProtoMessage() {}
|
||||
|
||||
func (x *Talkgroup) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_stillbox_proto_msgTypes[6]
|
||||
mi := &file_stillbox_proto_msgTypes[7]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
|
|
@ -576,7 +637,7 @@ func (x *Talkgroup) ProtoReflect() protoreflect.Message {
|
|||
|
||||
// Deprecated: Use Talkgroup.ProtoReflect.Descriptor instead.
|
||||
func (*Talkgroup) Descriptor() ([]byte, []int) {
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{6}
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{7}
|
||||
}
|
||||
|
||||
func (x *Talkgroup) GetSystem() int32 {
|
||||
|
|
@ -608,7 +669,7 @@ type Filter struct {
|
|||
func (x *Filter) Reset() {
|
||||
*x = Filter{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_stillbox_proto_msgTypes[7]
|
||||
mi := &file_stillbox_proto_msgTypes[8]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
|
@ -621,7 +682,7 @@ func (x *Filter) String() string {
|
|||
func (*Filter) ProtoMessage() {}
|
||||
|
||||
func (x *Filter) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_stillbox_proto_msgTypes[7]
|
||||
mi := &file_stillbox_proto_msgTypes[8]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
|
|
@ -634,7 +695,7 @@ func (x *Filter) ProtoReflect() protoreflect.Message {
|
|||
|
||||
// Deprecated: Use Filter.ProtoReflect.Descriptor instead.
|
||||
func (*Filter) Descriptor() ([]byte, []int) {
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{7}
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{8}
|
||||
}
|
||||
|
||||
func (x *Filter) GetTalkgroups() []*Talkgroup {
|
||||
|
|
@ -681,7 +742,7 @@ type Search struct {
|
|||
func (x *Search) Reset() {
|
||||
*x = Search{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_stillbox_proto_msgTypes[8]
|
||||
mi := &file_stillbox_proto_msgTypes[9]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
|
@ -694,7 +755,7 @@ func (x *Search) String() string {
|
|||
func (*Search) ProtoMessage() {}
|
||||
|
||||
func (x *Search) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_stillbox_proto_msgTypes[8]
|
||||
mi := &file_stillbox_proto_msgTypes[9]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
|
|
@ -707,7 +768,7 @@ func (x *Search) ProtoReflect() protoreflect.Message {
|
|||
|
||||
// Deprecated: Use Search.ProtoReflect.Descriptor instead.
|
||||
func (*Search) Descriptor() ([]byte, []int) {
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{8}
|
||||
return file_stillbox_proto_rawDescGZIP(), []int{9}
|
||||
}
|
||||
|
||||
var File_stillbox_proto protoreflect.FileDescriptor
|
||||
|
|
@ -716,7 +777,7 @@ var file_stillbox_proto_rawDesc = []byte{
|
|||
0x0a, 0x0e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
0x12, 0x08, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67,
|
||||
0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65,
|
||||
0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xae, 0x01, 0x0a, 0x07,
|
||||
0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd7, 0x01, 0x0a, 0x07,
|
||||
0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x6c, 0x6c, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78,
|
||||
0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x04, 0x63, 0x61, 0x6c, 0x6c, 0x12, 0x3c, 0x0a,
|
||||
|
|
@ -726,81 +787,85 @@ var file_stillbox_proto_rawDesc = []byte{
|
|||
0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x05, 0x70,
|
||||
0x6f, 0x70, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x74, 0x69,
|
||||
0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x48,
|
||||
0x00, 0x52, 0x05, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x42, 0x12, 0x0a, 0x10, 0x74, 0x6f, 0x43, 0x6c,
|
||||
0x69, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xd2, 0x02, 0x0a,
|
||||
0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x4e, 0x61,
|
||||
0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x4e,
|
||||
0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x54, 0x79, 0x70, 0x65,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x54, 0x79, 0x70,
|
||||
0x65, 0x12, 0x36, 0x0a, 0x08, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
|
||||
0x08, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x73,
|
||||
0x74, 0x65, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65,
|
||||
0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12,
|
||||
0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x65, 0x71, 0x75,
|
||||
0x65, 0x6e, 0x63, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x66, 0x72, 0x65, 0x71,
|
||||
0x75, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e,
|
||||
0x63, 0x69, 0x65, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0b, 0x66, 0x72, 0x65, 0x71,
|
||||
0x75, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68,
|
||||
0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65,
|
||||
0x73, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03,
|
||||
0x28, 0x05, 0x52, 0x07, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61,
|
||||
0x75, 0x64, 0x69, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x61, 0x75, 0x64, 0x69,
|
||||
0x6f, 0x22, 0x1d, 0x0a, 0x09, 0x55, 0x73, 0x65, 0x72, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67,
|
||||
0x22, 0x76, 0x0a, 0x0c, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x12, 0x36, 0x0a, 0x08, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08,
|
||||
0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61,
|
||||
0x63, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x72, 0x6c, 0x22, 0x82, 0x01, 0x0a, 0x07, 0x43, 0x6f, 0x6d,
|
||||
0x6d, 0x61, 0x6e, 0x64, 0x12, 0x32, 0x0a, 0x0b, 0x6c, 0x69, 0x76, 0x65, 0x43, 0x6f, 0x6d, 0x6d,
|
||||
0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x74, 0x69, 0x6c,
|
||||
0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x4c, 0x69, 0x76, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x6c, 0x69, 0x76,
|
||||
0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x38, 0x0a, 0x0d, 0x73, 0x65, 0x61, 0x72,
|
||||
0x63, 0x68, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x10, 0x2e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63,
|
||||
0x68, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x43, 0x6f, 0x6d, 0x6d, 0x61,
|
||||
0x6e, 0x64, 0x42, 0x09, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x22, 0x7a, 0x0a,
|
||||
0x04, 0x4c, 0x69, 0x76, 0x65, 0x12, 0x2e, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x0e, 0x32, 0x13, 0x2e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e,
|
||||
0x4c, 0x69, 0x76, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x05, 0x73, 0x74, 0x61,
|
||||
0x74, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78,
|
||||
0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x48, 0x01, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65,
|
||||
0x72, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x09,
|
||||
0x0a, 0x07, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0x41, 0x0a, 0x09, 0x54, 0x61, 0x6c,
|
||||
0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x1c,
|
||||
0x0a, 0x09, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x09, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x83, 0x02, 0x0a,
|
||||
0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x33, 0x0a, 0x0a, 0x74, 0x61, 0x6c, 0x6b, 0x67,
|
||||
0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x74,
|
||||
0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x54, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70,
|
||||
0x52, 0x0a, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x3a, 0x0a, 0x0e,
|
||||
0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x5f, 0x6e, 0x6f, 0x74, 0x18, 0x02,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e,
|
||||
0x54, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0d, 0x74, 0x61, 0x6c, 0x6b, 0x67,
|
||||
0x72, 0x6f, 0x75, 0x70, 0x73, 0x4e, 0x6f, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x74, 0x61, 0x6c, 0x6b,
|
||||
0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x5f, 0x61, 0x6c, 0x6c, 0x18, 0x03,
|
||||
0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x54,
|
||||
0x61, 0x67, 0x73, 0x41, 0x6c, 0x6c, 0x12, 0x2c, 0x0a, 0x12, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72,
|
||||
0x6f, 0x75, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x5f, 0x61, 0x6e, 0x79, 0x18, 0x04, 0x20, 0x03,
|
||||
0x28, 0x09, 0x52, 0x10, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x54, 0x61, 0x67,
|
||||
0x73, 0x41, 0x6e, 0x79, 0x12, 0x2c, 0x0a, 0x12, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75,
|
||||
0x70, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x5f, 0x6e, 0x6f, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09,
|
||||
0x52, 0x10, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x54, 0x61, 0x67, 0x73, 0x4e,
|
||||
0x6f, 0x74, 0x22, 0x08, 0x0a, 0x06, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2a, 0x37, 0x0a, 0x09,
|
||||
0x4c, 0x69, 0x76, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x0a, 0x4c, 0x53, 0x5f,
|
||||
0x53, 0x54, 0x4f, 0x50, 0x50, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x4c, 0x53, 0x5f,
|
||||
0x4c, 0x49, 0x56, 0x45, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x4c, 0x53, 0x5f, 0x50, 0x41, 0x55,
|
||||
0x53, 0x45, 0x44, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x00, 0x52, 0x05, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x12, 0x27, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f,
|
||||
0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62,
|
||||
0x6f, 0x78, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x48, 0x00, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f,
|
||||
0x72, 0x42, 0x12, 0x0a, 0x10, 0x74, 0x6f, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65,
|
||||
0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xd2, 0x02, 0x0a, 0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x1c,
|
||||
0x0a, 0x09, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x09, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09,
|
||||
0x61, 0x75, 0x64, 0x69, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x09, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x36, 0x0a, 0x08, 0x64, 0x61,
|
||||
0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
|
||||
0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54,
|
||||
0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69,
|
||||
0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x04, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61,
|
||||
0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74,
|
||||
0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72,
|
||||
0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
|
||||
0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x07, 0x20,
|
||||
0x01, 0x28, 0x03, 0x52, 0x09, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x20,
|
||||
0x0a, 0x0b, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x08, 0x20,
|
||||
0x03, 0x28, 0x03, 0x52, 0x0b, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73,
|
||||
0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28,
|
||||
0x05, 0x52, 0x07, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6f,
|
||||
0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6f, 0x75,
|
||||
0x72, 0x63, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x18, 0x0b, 0x20,
|
||||
0x01, 0x28, 0x0c, 0x52, 0x05, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x22, 0x1d, 0x0a, 0x09, 0x55, 0x73,
|
||||
0x65, 0x72, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x1d, 0x0a, 0x05, 0x45, 0x72, 0x72,
|
||||
0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x76, 0x0a, 0x0c, 0x4e, 0x6f, 0x74, 0x69,
|
||||
0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x36, 0x0a, 0x08, 0x64, 0x61, 0x74, 0x65,
|
||||
0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
|
||||
0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
|
||||
0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65,
|
||||
0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d,
|
||||
0x73, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x72, 0x6c, 0x18,
|
||||
0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x72, 0x6c,
|
||||
0x22, 0x82, 0x01, 0x0a, 0x07, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x32, 0x0a, 0x0b,
|
||||
0x6c, 0x69, 0x76, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x4c, 0x69, 0x76,
|
||||
0x65, 0x48, 0x00, 0x52, 0x0b, 0x6c, 0x69, 0x76, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64,
|
||||
0x12, 0x38, 0x0a, 0x0d, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e,
|
||||
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62,
|
||||
0x6f, 0x78, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x65, 0x61,
|
||||
0x72, 0x63, 0x68, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x42, 0x09, 0x0a, 0x07, 0x63, 0x6f,
|
||||
0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x22, 0x7a, 0x0a, 0x04, 0x4c, 0x69, 0x76, 0x65, 0x12, 0x2e, 0x0a,
|
||||
0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x13, 0x2e, 0x73,
|
||||
0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x4c, 0x69, 0x76, 0x65, 0x53, 0x74, 0x61, 0x74,
|
||||
0x65, 0x48, 0x00, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a,
|
||||
0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
|
||||
0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x48,
|
||||
0x01, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06,
|
||||
0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65,
|
||||
0x72, 0x22, 0x41, 0x0a, 0x09, 0x54, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
|
||||
0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72,
|
||||
0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x61, 0x6c, 0x6b, 0x67,
|
||||
0x72, 0x6f, 0x75, 0x70, 0x22, 0x83, 0x02, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12,
|
||||
0x33, 0x0a, 0x0a, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x01, 0x20,
|
||||
0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x54,
|
||||
0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0a, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72,
|
||||
0x6f, 0x75, 0x70, 0x73, 0x12, 0x3a, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75,
|
||||
0x70, 0x73, 0x5f, 0x6e, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73,
|
||||
0x74, 0x69, 0x6c, 0x6c, 0x62, 0x6f, 0x78, 0x2e, 0x54, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75,
|
||||
0x70, 0x52, 0x0d, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x4e, 0x6f, 0x74,
|
||||
0x12, 0x2c, 0x0a, 0x12, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x74, 0x61,
|
||||
0x67, 0x73, 0x5f, 0x61, 0x6c, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x74, 0x61,
|
||||
0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x54, 0x61, 0x67, 0x73, 0x41, 0x6c, 0x6c, 0x12, 0x2c,
|
||||
0x0a, 0x12, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x73,
|
||||
0x5f, 0x61, 0x6e, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x74, 0x61, 0x6c, 0x6b,
|
||||
0x67, 0x72, 0x6f, 0x75, 0x70, 0x54, 0x61, 0x67, 0x73, 0x41, 0x6e, 0x79, 0x12, 0x2c, 0x0a, 0x12,
|
||||
0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x5f, 0x6e,
|
||||
0x6f, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x74, 0x61, 0x6c, 0x6b, 0x67, 0x72,
|
||||
0x6f, 0x75, 0x70, 0x54, 0x61, 0x67, 0x73, 0x4e, 0x6f, 0x74, 0x22, 0x08, 0x0a, 0x06, 0x53, 0x65,
|
||||
0x61, 0x72, 0x63, 0x68, 0x2a, 0x37, 0x0a, 0x09, 0x4c, 0x69, 0x76, 0x65, 0x53, 0x74, 0x61, 0x74,
|
||||
0x65, 0x12, 0x0e, 0x0a, 0x0a, 0x4c, 0x53, 0x5f, 0x53, 0x54, 0x4f, 0x50, 0x50, 0x45, 0x44, 0x10,
|
||||
0x00, 0x12, 0x0b, 0x0a, 0x07, 0x4c, 0x53, 0x5f, 0x4c, 0x49, 0x56, 0x45, 0x10, 0x01, 0x12, 0x0d,
|
||||
0x0a, 0x09, 0x4c, 0x53, 0x5f, 0x50, 0x41, 0x55, 0x53, 0x45, 0x44, 0x10, 0x02, 0x42, 0x06, 0x5a,
|
||||
0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
|
@ -816,37 +881,39 @@ func file_stillbox_proto_rawDescGZIP() []byte {
|
|||
}
|
||||
|
||||
var file_stillbox_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
||||
var file_stillbox_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
|
||||
var file_stillbox_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
|
||||
var file_stillbox_proto_goTypes = []any{
|
||||
(LiveState)(0), // 0: stillbox.LiveState
|
||||
(*Message)(nil), // 1: stillbox.Message
|
||||
(*Call)(nil), // 2: stillbox.Call
|
||||
(*UserPopup)(nil), // 3: stillbox.UserPopup
|
||||
(*Notification)(nil), // 4: stillbox.Notification
|
||||
(*Command)(nil), // 5: stillbox.Command
|
||||
(*Live)(nil), // 6: stillbox.Live
|
||||
(*Talkgroup)(nil), // 7: stillbox.Talkgroup
|
||||
(*Filter)(nil), // 8: stillbox.Filter
|
||||
(*Search)(nil), // 9: stillbox.Search
|
||||
(*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp
|
||||
(*Error)(nil), // 4: stillbox.Error
|
||||
(*Notification)(nil), // 5: stillbox.Notification
|
||||
(*Command)(nil), // 6: stillbox.Command
|
||||
(*Live)(nil), // 7: stillbox.Live
|
||||
(*Talkgroup)(nil), // 8: stillbox.Talkgroup
|
||||
(*Filter)(nil), // 9: stillbox.Filter
|
||||
(*Search)(nil), // 10: stillbox.Search
|
||||
(*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp
|
||||
}
|
||||
var file_stillbox_proto_depIdxs = []int32{
|
||||
2, // 0: stillbox.Message.call:type_name -> stillbox.Call
|
||||
4, // 1: stillbox.Message.notification:type_name -> stillbox.Notification
|
||||
5, // 1: stillbox.Message.notification:type_name -> stillbox.Notification
|
||||
3, // 2: stillbox.Message.popup:type_name -> stillbox.UserPopup
|
||||
10, // 3: stillbox.Call.dateTime:type_name -> google.protobuf.Timestamp
|
||||
10, // 4: stillbox.Notification.dateTime:type_name -> google.protobuf.Timestamp
|
||||
6, // 5: stillbox.Command.liveCommand:type_name -> stillbox.Live
|
||||
9, // 6: stillbox.Command.searchCommand:type_name -> stillbox.Search
|
||||
0, // 7: stillbox.Live.state:type_name -> stillbox.LiveState
|
||||
8, // 8: stillbox.Live.filter:type_name -> stillbox.Filter
|
||||
7, // 9: stillbox.Filter.talkgroups:type_name -> stillbox.Talkgroup
|
||||
7, // 10: stillbox.Filter.talkgroups_not:type_name -> stillbox.Talkgroup
|
||||
11, // [11:11] is the sub-list for method output_type
|
||||
11, // [11:11] is the sub-list for method input_type
|
||||
11, // [11:11] is the sub-list for extension type_name
|
||||
11, // [11:11] is the sub-list for extension extendee
|
||||
0, // [0:11] is the sub-list for field type_name
|
||||
4, // 3: stillbox.Message.error:type_name -> stillbox.Error
|
||||
11, // 4: stillbox.Call.dateTime:type_name -> google.protobuf.Timestamp
|
||||
11, // 5: stillbox.Notification.dateTime:type_name -> google.protobuf.Timestamp
|
||||
7, // 6: stillbox.Command.liveCommand:type_name -> stillbox.Live
|
||||
10, // 7: stillbox.Command.searchCommand:type_name -> stillbox.Search
|
||||
0, // 8: stillbox.Live.state:type_name -> stillbox.LiveState
|
||||
9, // 9: stillbox.Live.filter:type_name -> stillbox.Filter
|
||||
8, // 10: stillbox.Filter.talkgroups:type_name -> stillbox.Talkgroup
|
||||
8, // 11: stillbox.Filter.talkgroups_not:type_name -> stillbox.Talkgroup
|
||||
12, // [12:12] is the sub-list for method output_type
|
||||
12, // [12:12] is the sub-list for method input_type
|
||||
12, // [12:12] is the sub-list for extension type_name
|
||||
12, // [12:12] is the sub-list for extension extendee
|
||||
0, // [0:12] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_stillbox_proto_init() }
|
||||
|
|
@ -892,7 +959,7 @@ func file_stillbox_proto_init() {
|
|||
}
|
||||
}
|
||||
file_stillbox_proto_msgTypes[3].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*Notification); i {
|
||||
switch v := v.(*Error); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
|
|
@ -904,7 +971,7 @@ func file_stillbox_proto_init() {
|
|||
}
|
||||
}
|
||||
file_stillbox_proto_msgTypes[4].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*Command); i {
|
||||
switch v := v.(*Notification); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
|
|
@ -916,7 +983,7 @@ func file_stillbox_proto_init() {
|
|||
}
|
||||
}
|
||||
file_stillbox_proto_msgTypes[5].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*Live); i {
|
||||
switch v := v.(*Command); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
|
|
@ -928,7 +995,7 @@ func file_stillbox_proto_init() {
|
|||
}
|
||||
}
|
||||
file_stillbox_proto_msgTypes[6].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*Talkgroup); i {
|
||||
switch v := v.(*Live); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
|
|
@ -940,7 +1007,7 @@ func file_stillbox_proto_init() {
|
|||
}
|
||||
}
|
||||
file_stillbox_proto_msgTypes[7].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*Filter); i {
|
||||
switch v := v.(*Talkgroup); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
|
|
@ -952,6 +1019,18 @@ func file_stillbox_proto_init() {
|
|||
}
|
||||
}
|
||||
file_stillbox_proto_msgTypes[8].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*Filter); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_stillbox_proto_msgTypes[9].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*Search); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
|
|
@ -968,19 +1047,20 @@ func file_stillbox_proto_init() {
|
|||
(*Message_Call)(nil),
|
||||
(*Message_Notification)(nil),
|
||||
(*Message_Popup)(nil),
|
||||
(*Message_Error)(nil),
|
||||
}
|
||||
file_stillbox_proto_msgTypes[4].OneofWrappers = []any{
|
||||
file_stillbox_proto_msgTypes[5].OneofWrappers = []any{
|
||||
(*Command_LiveCommand)(nil),
|
||||
(*Command_SearchCommand)(nil),
|
||||
}
|
||||
file_stillbox_proto_msgTypes[5].OneofWrappers = []any{}
|
||||
file_stillbox_proto_msgTypes[6].OneofWrappers = []any{}
|
||||
type x struct{}
|
||||
out := protoimpl.TypeBuilder{
|
||||
File: protoimpl.DescBuilder{
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_stillbox_proto_rawDesc,
|
||||
NumEnums: 1,
|
||||
NumMessages: 9,
|
||||
NumMessages: 10,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ message Message {
|
|||
Call call = 1;
|
||||
Notification notification = 2;
|
||||
UserPopup popup = 3;
|
||||
Error error = 4;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -30,6 +31,10 @@ message UserPopup {
|
|||
string msg = 1;
|
||||
}
|
||||
|
||||
message Error {
|
||||
string error = 1;
|
||||
}
|
||||
|
||||
message Notification {
|
||||
google.protobuf.Timestamp dateTime = 1;
|
||||
string msg = 2;
|
||||
|
|
|
|||
Loading…
Reference in a new issue