From 5ecdf3bc87c5e56312e094403c7bd8b8914732a9 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Thu, 22 Jan 2026 14:55:37 -0800 Subject: [PATCH 1/2] use rtc as the grant field, instead of video --- auth/grants.go | 53 ++++++++++++++++++++ auth/grants_test.go | 115 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) diff --git a/auth/grants.go b/auth/grants.go index 4743ef8bd..f5cc66122 100644 --- a/auth/grants.go +++ b/auth/grants.go @@ -15,6 +15,7 @@ package auth import ( + "encoding/json" "errors" "maps" "strings" @@ -245,6 +246,58 @@ func (c *ClaimGrants) MarshalLogObject(e zapcore.ObjectEncoder) error { return nil } +// claimGrantsJSON is used for JSON marshaling/unmarshaling to support both +// "video" (legacy) and "rtc" (new) field names for VideoGrant. +// This enables backwards compatibility during the migration from VideoGrant to RTCGrant. +type claimGrantsJSON struct { + Identity string `json:"identity,omitempty"` + Name string `json:"name,omitempty"` + Kind string `json:"kind,omitempty"` + KindDetails []string `json:"kindDetails,omitempty"` + Video *VideoGrant `json:"video,omitempty"` + RTC *VideoGrant `json:"rtc,omitempty"` + SIP *SIPGrant `json:"sip,omitempty"` + Agent *AgentGrant `json:"agent,omitempty"` + Inference *InferenceGrant `json:"inference,omitempty"` + Observability *ObservabilityGrant `json:"observability,omitempty"` + RoomConfig *RoomConfiguration `json:"roomConfig,omitempty"` + RoomPreset string `json:"roomPreset,omitempty"` + Sha256 string `json:"sha256,omitempty"` + Metadata string `json:"metadata,omitempty"` + Attributes map[string]string `json:"attributes,omitempty"` +} + +func (c *ClaimGrants) UnmarshalJSON(data []byte) error { + var j claimGrantsJSON + if err := json.Unmarshal(data, &j); err != nil { + return err + } + + c.Identity = j.Identity + c.Name = j.Name + c.Kind = j.Kind + c.KindDetails = j.KindDetails + c.SIP = j.SIP + c.Agent = j.Agent + c.Inference = j.Inference + c.Observability = j.Observability + c.RoomConfig = j.RoomConfig + c.RoomPreset = j.RoomPreset + c.Sha256 = j.Sha256 + c.Metadata = j.Metadata + c.Attributes = j.Attributes + + // Support both "video" (legacy) and "rtc" (new) field names. + // If both are present, "rtc" takes precedence. + if j.RTC != nil { + c.Video = j.RTC + } else { + c.Video = j.Video + } + + return nil +} + // ------------------------------------------------------------- type VideoGrant struct { diff --git a/auth/grants_test.go b/auth/grants_test.go index 211bc2097..459805a2e 100644 --- a/auth/grants_test.go +++ b/auth/grants_test.go @@ -15,6 +15,7 @@ package auth import ( + "encoding/json" "reflect" "strconv" "testing" @@ -159,6 +160,120 @@ func TestGrants(t *testing.T) { }) } +func TestClaimGrantsVideoRTCCompat(t *testing.T) { + t.Parallel() + + t.Run("unmarshal with video field", func(t *testing.T) { + jsonData := `{"identity":"user1","video":{"roomJoin":true,"room":"test-room","canPublish":true}}` + + var grants ClaimGrants + err := json.Unmarshal([]byte(jsonData), &grants) + require.NoError(t, err) + require.Equal(t, "user1", grants.Identity) + require.NotNil(t, grants.Video) + require.True(t, grants.Video.RoomJoin) + require.Equal(t, "test-room", grants.Video.Room) + require.True(t, grants.Video.GetCanPublish()) + }) + + t.Run("unmarshal with rtc field", func(t *testing.T) { + jsonData := `{"identity":"user2","rtc":{"roomJoin":true,"room":"rtc-room","canSubscribe":false}}` + + var grants ClaimGrants + err := json.Unmarshal([]byte(jsonData), &grants) + require.NoError(t, err) + require.Equal(t, "user2", grants.Identity) + require.NotNil(t, grants.Video) + require.True(t, grants.Video.RoomJoin) + require.Equal(t, "rtc-room", grants.Video.Room) + require.False(t, grants.Video.GetCanSubscribe()) + }) + + t.Run("unmarshal with both video and rtc fields prefers rtc", func(t *testing.T) { + jsonData := `{"identity":"user3","video":{"room":"video-room"},"rtc":{"room":"rtc-room"}}` + + var grants ClaimGrants + err := json.Unmarshal([]byte(jsonData), &grants) + require.NoError(t, err) + require.NotNil(t, grants.Video) + require.Equal(t, "rtc-room", grants.Video.Room, "rtc field should take precedence over video") + }) + + t.Run("marshal outputs video field", func(t *testing.T) { + grants := &ClaimGrants{ + Identity: "user4", + Video: &VideoGrant{ + RoomJoin: true, + Room: "my-room", + }, + } + + data, err := json.Marshal(grants) + require.NoError(t, err) + + // Verify the output contains "video" not "rtc" + var rawMap map[string]interface{} + err = json.Unmarshal(data, &rawMap) + require.NoError(t, err) + require.Contains(t, rawMap, "video", "marshaled JSON should contain 'video' field") + require.NotContains(t, rawMap, "rtc", "marshaled JSON should not contain 'rtc' field") + }) + + t.Run("roundtrip with video field preserves data", func(t *testing.T) { + original := &ClaimGrants{ + Identity: "user5", + Name: "Test User", + Video: &VideoGrant{ + RoomJoin: true, + Room: "test-room", + RoomCreate: true, + }, + SIP: &SIPGrant{Admin: true}, + } + + data, err := json.Marshal(original) + require.NoError(t, err) + + var decoded ClaimGrants + err = json.Unmarshal(data, &decoded) + require.NoError(t, err) + + require.Equal(t, original.Identity, decoded.Identity) + require.Equal(t, original.Name, decoded.Name) + require.Equal(t, original.Video.RoomJoin, decoded.Video.RoomJoin) + require.Equal(t, original.Video.Room, decoded.Video.Room) + require.Equal(t, original.Video.RoomCreate, decoded.Video.RoomCreate) + require.Equal(t, original.SIP.Admin, decoded.SIP.Admin) + }) + + t.Run("unmarshal with all grant types via rtc", func(t *testing.T) { + jsonData := `{ + "identity": "agent1", + "kind": "agent", + "rtc": {"roomJoin": true, "room": "agent-room", "agent": true}, + "sip": {"admin": true}, + "agent": {"admin": true}, + "inference": {"perform": true} + }` + + var grants ClaimGrants + err := json.Unmarshal([]byte(jsonData), &grants) + require.NoError(t, err) + require.Equal(t, "agent1", grants.Identity) + require.Equal(t, "agent", grants.Kind) + require.NotNil(t, grants.Video) + require.True(t, grants.Video.RoomJoin) + require.Equal(t, "agent-room", grants.Video.Room) + require.True(t, grants.Video.Agent) + require.NotNil(t, grants.SIP) + require.True(t, grants.SIP.Admin) + require.NotNil(t, grants.Agent) + require.True(t, grants.Agent.Admin) + require.NotNil(t, grants.Inference) + require.True(t, grants.Inference.Perform) + }) +} + func TestParticipantKind(t *testing.T) { const kindMin, kindMax = livekit.ParticipantInfo_STANDARD, livekit.ParticipantInfo_AGENT for k := kindMin; k <= kindMax; k++ { From 4f1c06741a433a6be694a93e42e30de7a02ce42a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Jan 2026 22:57:19 +0000 Subject: [PATCH 2/2] generated protobuf --- livekit/agent/livekit_agent_session.pb.go | 2 +- livekit/livekit_phone_number.pb.go | 2 +- livekit/livekit_phone_number.twirp.go | 153 +++++++++++----------- livekit/logger/options.pb.go | 2 +- 4 files changed, 80 insertions(+), 79 deletions(-) diff --git a/livekit/agent/livekit_agent_session.pb.go b/livekit/agent/livekit_agent_session.pb.go index e171671b7..e7cb97e17 100644 --- a/livekit/agent/livekit_agent_session.pb.go +++ b/livekit/agent/livekit_agent_session.pb.go @@ -802,7 +802,7 @@ const file_agent_livekit_agent_session_proto_rawDesc = "" + "\n" + "\x06SYSTEM\x10\x01\x12\b\n" + "\x04USER\x10\x02\x12\r\n" + - "\tASSISTANT\x10\x03B+Z)github.com/livekit/protocol/livekit/agentb\x06proto3" + "\tASSISTANT\x10\x03BLZ)github.com/livekit/protocol/livekit/agent\xaa\x02\rLiveKit.Proto\xea\x02\x0eLiveKit::Protob\x06proto3" var ( file_agent_livekit_agent_session_proto_rawDescOnce sync.Once diff --git a/livekit/livekit_phone_number.pb.go b/livekit/livekit_phone_number.pb.go index 4a0de4165..5d7906724 100644 --- a/livekit/livekit_phone_number.pb.go +++ b/livekit/livekit_phone_number.pb.go @@ -1051,7 +1051,7 @@ const file_livekit_phone_number_proto_rawDesc = "" + "\x10ListPhoneNumbers\x12 .livekit.ListPhoneNumbersRequest\x1a!.livekit.ListPhoneNumbersResponse\"\x00\x12S\n" + "\x0eGetPhoneNumber\x12\x1e.livekit.GetPhoneNumberRequest\x1a\x1f.livekit.GetPhoneNumberResponse\"\x00\x12\\\n" + "\x11UpdatePhoneNumber\x12!.livekit.UpdatePhoneNumberRequest\x1a\".livekit.UpdatePhoneNumberResponse\"\x00\x12b\n" + - "\x13ReleasePhoneNumbers\x12#.livekit.ReleasePhoneNumbersRequest\x1a$.livekit.ReleasePhoneNumbersResponse\"\x00B%Z#github.com/livekit/protocol/livekitb\x06proto3" + "\x13ReleasePhoneNumbers\x12#.livekit.ReleasePhoneNumbersRequest\x1a$.livekit.ReleasePhoneNumbersResponse\"\x00BFZ#github.com/livekit/protocol/livekit\xaa\x02\rLiveKit.Proto\xea\x02\x0eLiveKit::Protob\x06proto3" var ( file_livekit_phone_number_proto_rawDescOnce sync.Once diff --git a/livekit/livekit_phone_number.twirp.go b/livekit/livekit_phone_number.twirp.go index fc4f0c610..0229abb67 100644 --- a/livekit/livekit_phone_number.twirp.go +++ b/livekit/livekit_phone_number.twirp.go @@ -1919,80 +1919,81 @@ func (s *phoneNumberServiceServer) PathPrefix() string { } var twirpFileDescriptor6 = []byte{ - // 1190 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xdd, 0x6e, 0xe2, 0x46, - 0x14, 0x66, 0x20, 0x64, 0xc3, 0x81, 0x24, 0xec, 0xec, 0x4f, 0x1c, 0x67, 0xb3, 0x61, 0x9d, 0xb6, - 0x42, 0xb9, 0x20, 0xda, 0xec, 0x6a, 0xab, 0xa8, 0xbd, 0x28, 0x24, 0xce, 0x06, 0x95, 0x05, 0x6a, - 0x48, 0xdb, 0xad, 0x2a, 0x59, 0xc6, 0x4c, 0xc8, 0x68, 0x8d, 0xed, 0xda, 0xc3, 0xaa, 0x79, 0x83, - 0x55, 0xd5, 0x8b, 0xaa, 0xcf, 0xb3, 0xea, 0x0b, 0x54, 0xea, 0x33, 0xf4, 0x51, 0xaa, 0x19, 0x1b, - 0xc7, 0xc4, 0x36, 0xb9, 0x68, 0xa5, 0xde, 0xe1, 0x73, 0xbe, 0x73, 0xe6, 0xcc, 0x37, 0xdf, 0x9c, - 0x33, 0x80, 0x6c, 0xd1, 0xf7, 0xe4, 0x1d, 0x65, 0xba, 0x7b, 0xe5, 0xd8, 0x44, 0xb7, 0x67, 0xd3, - 0x11, 0xf1, 0x1a, 0xae, 0xe7, 0x30, 0x07, 0xdf, 0x0b, 0x7d, 0xf2, 0xde, 0xc4, 0x71, 0x26, 0x16, - 0x39, 0x14, 0xe6, 0xd1, 0xec, 0xf2, 0x90, 0xd1, 0x29, 0xf1, 0x99, 0x31, 0x75, 0x03, 0xa4, 0xfc, - 0x70, 0x9e, 0x65, 0xea, 0x8c, 0x89, 0xe5, 0x07, 0x56, 0xe5, 0x6f, 0x04, 0xdb, 0x03, 0x62, 0x78, - 0xe6, 0x55, 0x9f, 0x27, 0xef, 0x8a, 0xdc, 0xbe, 0x46, 0x7e, 0x9a, 0x11, 0x9f, 0xe1, 0x67, 0x50, - 0x31, 0x9d, 0x99, 0xcd, 0xbc, 0x6b, 0xdd, 0x74, 0xc6, 0x44, 0x42, 0x35, 0x54, 0x2f, 0x69, 0xe5, - 0xd0, 0x76, 0xe2, 0x8c, 0x09, 0xae, 0x41, 0xc9, 0xf0, 0x88, 0x11, 0xf8, 0xf3, 0xdc, 0x7f, 0x9e, - 0xd3, 0xd6, 0xb8, 0x89, 0xbb, 0x3f, 0x20, 0x84, 0xb7, 0xa1, 0x68, 0xd1, 0x29, 0x65, 0x52, 0xa1, - 0x86, 0xea, 0xc5, 0x73, 0xa4, 0x05, 0x9f, 0xdc, 0xf5, 0x25, 0x80, 0x6b, 0x4c, 0x88, 0xce, 0x9c, - 0x77, 0xc4, 0x96, 0x56, 0x6a, 0xa8, 0x5e, 0x3e, 0x92, 0x1a, 0x61, 0xa1, 0x8d, 0x21, 0xb7, 0xf6, - 0x8d, 0x09, 0xb5, 0x0d, 0x46, 0x1d, 0xfb, 0x3c, 0xaf, 0x95, 0x38, 0x5a, 0x98, 0x3f, 0x20, 0xd4, - 0xaa, 0x00, 0xe8, 0xd1, 0xda, 0xad, 0x35, 0x58, 0xd5, 0x45, 0xe2, 0xd6, 0x3a, 0x94, 0xf5, 0x9b, - 0xb4, 0xca, 0x2f, 0x08, 0xe4, 0xb4, 0x2d, 0xfa, 0xae, 0x63, 0xfb, 0x04, 0x1f, 0x40, 0x91, 0x32, - 0x32, 0xf5, 0x25, 0x54, 0x2b, 0xd4, 0xcb, 0x47, 0x0f, 0xa3, 0xe5, 0x63, 0x68, 0x2d, 0x80, 0xe0, - 0xaf, 0x60, 0xd3, 0x26, 0x3f, 0xb3, 0x58, 0x76, 0xb1, 0xe5, 0x25, 0x45, 0x6b, 0xeb, 0x3c, 0xa0, - 0x3f, 0x2f, 0x5b, 0xf9, 0x0d, 0x81, 0xdc, 0x9f, 0x79, 0xe6, 0x95, 0xe1, 0x93, 0xf8, 0x02, 0x21, - 0xe1, 0xfb, 0xb0, 0x1e, 0x3f, 0xe4, 0xa0, 0xa8, 0x92, 0x56, 0x71, 0x63, 0x95, 0xe3, 0x97, 0xf0, - 0xd0, 0xa7, 0xae, 0x3e, 0xa6, 0xbe, 0x6b, 0x30, 0xf3, 0x4a, 0xf7, 0x66, 0x16, 0xd1, 0xe9, 0x38, - 0x62, 0xff, 0xbe, 0x4f, 0xdd, 0xd3, 0xd0, 0xa9, 0xcd, 0x2c, 0xd2, 0x1e, 0x73, 0xb6, 0xb6, 0xe0, - 0x91, 0x9e, 0x16, 0xa6, 0x7c, 0x0f, 0x3b, 0xa9, 0x15, 0x85, 0xfc, 0x1c, 0xa7, 0x95, 0x94, 0xc5, - 0xd3, 0x42, 0xa1, 0xca, 0xef, 0x79, 0xd8, 0xea, 0x50, 0x9f, 0xa5, 0x49, 0x2b, 0x52, 0x05, 0x12, - 0xaa, 0xc8, 0xc5, 0x54, 0xf1, 0x0a, 0xd6, 0x7c, 0x66, 0xb0, 0x99, 0x4f, 0x7c, 0x29, 0x5f, 0x2b, - 0xd4, 0x37, 0x8e, 0xe4, 0xb4, 0xc5, 0x06, 0x02, 0xa3, 0x45, 0xd8, 0x5b, 0x6a, 0x2a, 0xdc, 0xa1, - 0x26, 0xb4, 0xa8, 0xa6, 0x4c, 0x56, 0x57, 0x04, 0xab, 0xf9, 0x0c, 0x56, 0xb3, 0x54, 0x97, 0x4d, - 0xf7, 0x5f, 0x08, 0xa4, 0x24, 0x29, 0xff, 0x87, 0x18, 0xf1, 0x1e, 0x94, 0x99, 0xc3, 0x0c, 0x4b, - 0x17, 0x17, 0x3a, 0xb8, 0x9f, 0x1a, 0x08, 0xd3, 0x09, 0xb7, 0x70, 0x39, 0x3a, 0x97, 0x97, 0x16, - 0xb5, 0x49, 0x08, 0x59, 0x11, 0x90, 0x4a, 0x68, 0x14, 0x20, 0xc5, 0x82, 0x47, 0xaf, 0x09, 0x4b, - 0x11, 0xf3, 0x03, 0xc8, 0xd3, 0x71, 0xd0, 0x33, 0xce, 0x73, 0x5a, 0x9e, 0x72, 0xc2, 0xf0, 0x67, - 0x50, 0x89, 0xcb, 0x29, 0x14, 0x2d, 0xd2, 0xca, 0x31, 0xe5, 0x70, 0x62, 0x8b, 0x50, 0xd0, 0xe9, - 0xb8, 0xb5, 0x09, 0xeb, 0x0b, 0x6d, 0x4f, 0xf9, 0x06, 0x1e, 0xdf, 0x5e, 0x2d, 0xe4, 0xee, 0xf3, - 0x5b, 0x99, 0x91, 0x20, 0x23, 0x9d, 0xc2, 0xf8, 0x6a, 0xca, 0x1f, 0x08, 0xa4, 0x0b, 0x77, 0x6c, - 0x30, 0xf2, 0x1f, 0x6f, 0x22, 0x53, 0x53, 0x85, 0xa5, 0x9a, 0xca, 0xd8, 0x7a, 0xb6, 0xa4, 0x86, - 0xb0, 0x9d, 0x52, 0xff, 0xbf, 0xa5, 0x65, 0x00, 0xb2, 0x46, 0x2c, 0xb2, 0xd8, 0x16, 0xa2, 0xfb, - 0x5b, 0x85, 0x02, 0x1d, 0xcf, 0xfb, 0x13, 0xff, 0x99, 0xec, 0x5d, 0xf9, 0x64, 0xef, 0x52, 0x76, - 0x61, 0x27, 0x35, 0x69, 0x50, 0xac, 0xf2, 0xb1, 0x08, 0xe5, 0x98, 0x03, 0x6f, 0xdc, 0xb0, 0xcf, - 0xb9, 0xe7, 0x8a, 0x25, 0xcf, 0x5f, 0xbd, 0xd4, 0x2f, 0x1d, 0x6f, 0x6a, 0xb0, 0x80, 0x77, 0x0d, - 0xb8, 0xe9, 0x4c, 0x58, 0x12, 0x13, 0xab, 0x90, 0x9c, 0x58, 0x3b, 0xf1, 0x89, 0x25, 0x6e, 0xf7, - 0xcd, 0xbc, 0xc2, 0xc7, 0x50, 0x0e, 0xca, 0xd7, 0xd9, 0xb5, 0x4b, 0xa4, 0x62, 0x0d, 0xd5, 0x37, - 0x62, 0x17, 0x2a, 0x56, 0xdb, 0xf0, 0xda, 0x25, 0x1a, 0xd8, 0xd1, 0x6f, 0x2c, 0xc3, 0x9a, 0xe5, - 0x98, 0x86, 0x45, 0xd9, 0xb5, 0xb4, 0x1a, 0xa4, 0x9d, 0x7f, 0xe3, 0xc7, 0xb0, 0xea, 0x91, 0x09, - 0x75, 0x6c, 0xe9, 0x9e, 0xf0, 0x84, 0x5f, 0x78, 0x17, 0xc0, 0x77, 0x8d, 0xa9, 0xee, 0x9b, 0x8e, - 0x47, 0xa4, 0xb5, 0x1a, 0xaa, 0x23, 0xad, 0xc4, 0x2d, 0x03, 0x6e, 0xc0, 0xc7, 0x00, 0xa6, 0x47, - 0x0c, 0x46, 0xc6, 0xba, 0xc1, 0xa4, 0x92, 0x38, 0x39, 0xb9, 0x11, 0x4c, 0xfa, 0xc6, 0x7c, 0xd2, - 0x37, 0x86, 0xf3, 0x49, 0xaf, 0x95, 0x42, 0x74, 0x93, 0xf1, 0xd0, 0x99, 0xd0, 0x84, 0x08, 0x85, - 0xbb, 0x43, 0x43, 0x74, 0x93, 0x61, 0x05, 0x2a, 0xa6, 0xe1, 0x1a, 0x23, 0x6a, 0x51, 0x46, 0x89, - 0x2f, 0x95, 0x83, 0x73, 0x8c, 0xdb, 0xf0, 0x11, 0xac, 0x06, 0x7d, 0x57, 0xaa, 0x08, 0x8a, 0x96, - 0x75, 0xe8, 0x10, 0x89, 0xbf, 0x80, 0xb2, 0xe1, 0xfb, 0x74, 0x62, 0x07, 0x35, 0xad, 0xdf, 0x59, - 0x13, 0xcc, 0xe1, 0x4d, 0xc6, 0x83, 0xbd, 0x40, 0x38, 0x22, 0x78, 0xe3, 0xee, 0xe0, 0x39, 0xbc, - 0xc9, 0xf0, 0x8b, 0x8c, 0x7b, 0xb8, 0xc9, 0x0f, 0xa3, 0x95, 0x97, 0x50, 0xca, 0x4d, 0xc4, 0xcf, - 0xe1, 0x51, 0x5a, 0x90, 0x2f, 0x55, 0x05, 0x1f, 0x38, 0x11, 0xe1, 0x1f, 0x7c, 0x44, 0x70, 0x3f, - 0xb1, 0x7f, 0xbc, 0x0f, 0x7b, 0xfd, 0xf3, 0x5e, 0x57, 0xd5, 0xbb, 0x17, 0x6f, 0x5a, 0xaa, 0xa6, - 0x0f, 0x86, 0xcd, 0xe1, 0xc5, 0x40, 0xbf, 0xe8, 0x0e, 0xfa, 0xea, 0x49, 0xfb, 0xac, 0xad, 0x9e, - 0x56, 0x73, 0xf8, 0x29, 0xc8, 0x69, 0xa0, 0xe6, 0xc9, 0xb0, 0xfd, 0xad, 0x5a, 0x45, 0x78, 0x0f, - 0x76, 0xd2, 0xfc, 0x7d, 0xb5, 0x7b, 0xda, 0xee, 0xbe, 0xae, 0xe6, 0x71, 0x0d, 0x9e, 0xa4, 0x01, - 0x34, 0xb5, 0xa3, 0x36, 0x07, 0xea, 0x69, 0xb5, 0x90, 0x95, 0xa2, 0x77, 0x76, 0xd6, 0x69, 0x77, - 0xd5, 0xea, 0xca, 0xc1, 0xaf, 0x08, 0x36, 0x6f, 0x29, 0x1c, 0xef, 0xc2, 0xf6, 0x42, 0xd0, 0xf0, - 0x6d, 0x5f, 0xd5, 0x2f, 0xba, 0x5f, 0x77, 0x7b, 0xdf, 0x75, 0xab, 0x39, 0xfc, 0x04, 0xa4, 0xa4, - 0xfb, 0x4d, 0xaf, 0xd5, 0xee, 0xf0, 0xa2, 0x77, 0x60, 0x2b, 0xe9, 0xed, 0xf4, 0x4e, 0x9a, 0x9d, - 0x6a, 0x3e, 0x51, 0x8e, 0x70, 0x0e, 0x7b, 0x9d, 0x8e, 0x7e, 0xa6, 0xa9, 0x6a, 0xb5, 0x70, 0xf4, - 0xe7, 0x0a, 0xe0, 0x38, 0x9b, 0xc4, 0x7b, 0x4f, 0x4d, 0x82, 0x75, 0xc0, 0xc9, 0xe7, 0x1c, 0x56, - 0x22, 0x01, 0x66, 0x3e, 0x67, 0xe5, 0xfd, 0xa5, 0x98, 0xb0, 0x05, 0xe5, 0xf0, 0x08, 0x1e, 0xa4, - 0x3c, 0x88, 0xf0, 0x4d, 0x74, 0xf6, 0x03, 0x4e, 0xfe, 0x64, 0x39, 0x28, 0x5a, 0xe3, 0x2d, 0x54, - 0x6f, 0x3f, 0x02, 0x70, 0x2d, 0x8a, 0xcd, 0x78, 0x34, 0xc9, 0xcf, 0x96, 0x20, 0xa2, 0xd4, 0x03, - 0xd8, 0x58, 0x9c, 0x90, 0xf8, 0x69, 0x14, 0x96, 0x3a, 0xa8, 0xe5, 0xbd, 0x4c, 0x7f, 0x94, 0xf4, - 0x47, 0xb8, 0x9f, 0x18, 0x31, 0xf8, 0xa6, 0x9c, 0xac, 0xf1, 0x29, 0x2b, 0xcb, 0x20, 0x71, 0xc6, - 0x53, 0xa6, 0x42, 0x8c, 0xf1, 0xec, 0x41, 0x14, 0x63, 0x7c, 0xd9, 0x60, 0xc9, 0xb5, 0x3e, 0xfd, - 0x61, 0x7f, 0x42, 0xd9, 0xd5, 0x6c, 0xd4, 0x30, 0x9d, 0xe9, 0x61, 0x18, 0x13, 0xfc, 0x5d, 0x32, - 0x1d, 0x6b, 0x6e, 0x18, 0xad, 0x0a, 0xcb, 0x8b, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc8, 0xbb, - 0xfd, 0x42, 0x75, 0x0d, 0x00, 0x00, + // 1213 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x5d, 0x6e, 0xdb, 0x46, + 0x10, 0xd6, 0x52, 0xb6, 0x63, 0x8d, 0x64, 0x5b, 0xd9, 0xfc, 0xd1, 0x74, 0x12, 0x2b, 0x74, 0x51, + 0x08, 0x79, 0x50, 0x10, 0x27, 0x48, 0x91, 0xb4, 0x0f, 0x95, 0x6c, 0x3a, 0x16, 0xa2, 0x48, 0x2a, + 0x25, 0xb7, 0x4d, 0x51, 0x80, 0xa0, 0xa8, 0xb5, 0xbc, 0x08, 0x45, 0xb2, 0xe4, 0xca, 0xa8, 0x6f, + 0x10, 0x14, 0x7d, 0x28, 0x7a, 0x8c, 0x9e, 0x21, 0xe8, 0x05, 0x0a, 0xf4, 0x0c, 0x7d, 0xee, 0x29, + 0x8a, 0x5d, 0x52, 0x34, 0x65, 0x92, 0xf2, 0x43, 0x0b, 0xf4, 0x4d, 0x9c, 0xf9, 0x66, 0x76, 0xf6, + 0xdb, 0x6f, 0x67, 0x56, 0xa0, 0xd8, 0xf4, 0x9c, 0xbc, 0xa7, 0xcc, 0xf0, 0xce, 0x5c, 0x87, 0x18, + 0xce, 0x6c, 0x3a, 0x22, 0x7e, 0xc3, 0xf3, 0x5d, 0xe6, 0xe2, 0x1b, 0x91, 0x4f, 0xd9, 0x9d, 0xb8, + 0xee, 0xc4, 0x26, 0x4f, 0x84, 0x79, 0x34, 0x3b, 0x7d, 0xc2, 0xe8, 0x94, 0x04, 0xcc, 0x9c, 0x7a, + 0x21, 0x52, 0xb9, 0x3d, 0xcf, 0x32, 0x75, 0xc7, 0xc4, 0x0e, 0x42, 0xab, 0xfa, 0x17, 0x82, 0xed, + 0x01, 0x31, 0x7d, 0xeb, 0xac, 0xcf, 0x93, 0x77, 0x45, 0xee, 0x40, 0x27, 0x3f, 0xcc, 0x48, 0xc0, + 0xf0, 0x23, 0xa8, 0x58, 0xee, 0xcc, 0x61, 0xfe, 0x85, 0x61, 0xb9, 0x63, 0x22, 0xa3, 0x1a, 0xaa, + 0x97, 0xf4, 0x72, 0x64, 0x3b, 0x70, 0xc7, 0x04, 0xd7, 0xa0, 0x64, 0xfa, 0xc4, 0x0c, 0xfd, 0x12, + 0xf7, 0x1f, 0x17, 0xf4, 0x75, 0x6e, 0xe2, 0xee, 0x0f, 0x08, 0xe1, 0x6d, 0x58, 0xb5, 0xe9, 0x94, + 0x32, 0xb9, 0x58, 0x43, 0xf5, 0xd5, 0x63, 0xa4, 0x87, 0x9f, 0xdc, 0xf5, 0x05, 0x80, 0x67, 0x4e, + 0x88, 0xc1, 0xdc, 0xf7, 0xc4, 0x91, 0x57, 0x6a, 0xa8, 0x5e, 0xde, 0x97, 0x1b, 0x51, 0xa1, 0x8d, + 0x21, 0xb7, 0xf6, 0xcd, 0x09, 0x75, 0x4c, 0x46, 0x5d, 0xe7, 0x58, 0xd2, 0x4b, 0x1c, 0x2d, 0xcc, + 0x1f, 0x10, 0x6a, 0x55, 0x00, 0x8c, 0x78, 0xed, 0xd6, 0x3a, 0xac, 0x19, 0x22, 0x71, 0x6b, 0x03, + 0xca, 0xc6, 0x65, 0x5a, 0xf5, 0x27, 0x04, 0x4a, 0xd6, 0x16, 0x03, 0xcf, 0x75, 0x02, 0x82, 0x1f, + 0xc3, 0x2a, 0x65, 0x64, 0x1a, 0xc8, 0xa8, 0x56, 0xac, 0x97, 0xf7, 0x6f, 0xc7, 0xcb, 0x27, 0xd0, + 0x7a, 0x08, 0xc1, 0x5f, 0xc2, 0x96, 0x43, 0x7e, 0x64, 0x89, 0xec, 0x62, 0xcb, 0x4b, 0x8a, 0xd6, + 0x37, 0x78, 0x40, 0x7f, 0x5e, 0xb6, 0xfa, 0x0b, 0x02, 0xa5, 0x3f, 0xf3, 0xad, 0x33, 0x33, 0x20, + 0xc9, 0x05, 0x22, 0xc2, 0xf7, 0x60, 0x23, 0x79, 0xc8, 0x61, 0x51, 0x25, 0xbd, 0xe2, 0x25, 0x2a, + 0xc7, 0xcf, 0xe1, 0x76, 0x40, 0x3d, 0x63, 0x4c, 0x03, 0xcf, 0x64, 0xd6, 0x99, 0xe1, 0xcf, 0x6c, + 0x62, 0xd0, 0x71, 0xcc, 0xfe, 0xcd, 0x80, 0x7a, 0x87, 0x91, 0x53, 0x9f, 0xd9, 0xa4, 0x3d, 0xe6, + 0x6c, 0xdd, 0x83, 0x3b, 0x46, 0x56, 0x98, 0xfa, 0x2d, 0xec, 0x64, 0x56, 0x14, 0xf1, 0xf3, 0x32, + 0xab, 0xa4, 0x3c, 0x9e, 0x16, 0x0a, 0x55, 0x7f, 0x95, 0xe0, 0x5e, 0x87, 0x06, 0x2c, 0x4b, 0x5a, + 0xb1, 0x2a, 0x90, 0x50, 0x45, 0x21, 0xa1, 0x8a, 0x17, 0xb0, 0x1e, 0x30, 0x93, 0xcd, 0x02, 0x12, + 0xc8, 0x52, 0xad, 0x58, 0xdf, 0xdc, 0x57, 0xb2, 0x16, 0x1b, 0x08, 0x8c, 0x1e, 0x63, 0xaf, 0xa8, + 0xa9, 0x78, 0x8d, 0x9a, 0xd0, 0xa2, 0x9a, 0x72, 0x59, 0x5d, 0x11, 0xac, 0x4a, 0x39, 0xac, 0xe6, + 0xa9, 0x2e, 0x9f, 0xee, 0x3f, 0x11, 0xc8, 0x69, 0x52, 0xfe, 0x0f, 0x31, 0xe2, 0x5d, 0x28, 0x33, + 0x97, 0x99, 0xb6, 0x21, 0x2e, 0x74, 0x78, 0x3f, 0x75, 0x10, 0xa6, 0x03, 0x6e, 0xe1, 0x72, 0x74, + 0x4f, 0x4f, 0x6d, 0xea, 0x90, 0x08, 0xb2, 0x22, 0x20, 0x95, 0xc8, 0x28, 0x40, 0xaa, 0x0d, 0x77, + 0x5e, 0x13, 0x96, 0x21, 0xe6, 0x5b, 0x20, 0xd1, 0x71, 0xd8, 0x33, 0x8e, 0x0b, 0xba, 0x44, 0x39, + 0x61, 0xf8, 0x53, 0xa8, 0x24, 0xe5, 0x14, 0x89, 0x16, 0xe9, 0xe5, 0x84, 0x72, 0x38, 0xb1, 0xab, + 0x50, 0x34, 0xe8, 0xb8, 0xb5, 0x05, 0x1b, 0x0b, 0x6d, 0x4f, 0xfd, 0x0a, 0xee, 0x5e, 0x5d, 0x2d, + 0xe2, 0xee, 0xb3, 0x2b, 0x99, 0x91, 0x20, 0x23, 0x9b, 0xc2, 0xe4, 0x6a, 0xea, 0xef, 0x08, 0xe4, + 0x13, 0x6f, 0x6c, 0x32, 0xf2, 0x1f, 0x6f, 0x22, 0x57, 0x53, 0xc5, 0xa5, 0x9a, 0xca, 0xd9, 0x7a, + 0xbe, 0xa4, 0x86, 0xb0, 0x9d, 0x51, 0xff, 0xbf, 0xa5, 0x65, 0x00, 0x8a, 0x4e, 0x6c, 0xb2, 0xd8, + 0x16, 0xe2, 0xfb, 0x5b, 0x85, 0x22, 0x1d, 0xcf, 0xfb, 0x13, 0xff, 0x99, 0xee, 0x5d, 0x52, 0xba, + 0x77, 0xa9, 0x0f, 0x60, 0x27, 0x33, 0x69, 0x58, 0xac, 0xfa, 0x71, 0x15, 0xca, 0x09, 0x07, 0xde, + 0xbc, 0x64, 0x9f, 0x73, 0xcf, 0x15, 0x4b, 0x9e, 0xbe, 0x78, 0x6e, 0x9c, 0xba, 0xfe, 0xd4, 0x64, + 0x21, 0xef, 0x3a, 0x70, 0xd3, 0x91, 0xb0, 0xa4, 0x26, 0x56, 0x31, 0x3d, 0xb1, 0x76, 0x92, 0x13, + 0x4b, 0xdc, 0xee, 0xcb, 0x79, 0x85, 0x5f, 0x42, 0x39, 0x2c, 0xdf, 0x60, 0x17, 0x1e, 0x91, 0x57, + 0x6b, 0xa8, 0xbe, 0x99, 0xb8, 0x50, 0x89, 0xda, 0x86, 0x17, 0x1e, 0xd1, 0xc1, 0x89, 0x7f, 0x63, + 0x05, 0xd6, 0x6d, 0xd7, 0x32, 0x6d, 0xca, 0x2e, 0xe4, 0xb5, 0x30, 0xed, 0xfc, 0x1b, 0xdf, 0x85, + 0x35, 0x9f, 0x4c, 0xa8, 0xeb, 0xc8, 0x37, 0x84, 0x27, 0xfa, 0xc2, 0x0f, 0x00, 0x02, 0xcf, 0x9c, + 0x1a, 0x81, 0xe5, 0xfa, 0x44, 0x5e, 0xaf, 0xa1, 0x3a, 0xd2, 0x4b, 0xdc, 0x32, 0xe0, 0x06, 0xfc, + 0x12, 0xc0, 0xf2, 0x89, 0xc9, 0xc8, 0xd8, 0x30, 0x99, 0x5c, 0x12, 0x27, 0xa7, 0x34, 0xc2, 0x49, + 0xdf, 0x98, 0x4f, 0xfa, 0xc6, 0x70, 0x3e, 0xe9, 0xf5, 0x52, 0x84, 0x6e, 0x32, 0x1e, 0x3a, 0x13, + 0x9a, 0x10, 0xa1, 0x70, 0x7d, 0x68, 0x84, 0x6e, 0x32, 0xac, 0x42, 0xc5, 0x32, 0x3d, 0x73, 0x44, + 0x6d, 0xca, 0x28, 0x09, 0xe4, 0x72, 0x78, 0x8e, 0x49, 0x1b, 0xde, 0x87, 0xb5, 0xb0, 0xef, 0xca, + 0x15, 0x41, 0xd1, 0xb2, 0x0e, 0x1d, 0x21, 0xf1, 0xe7, 0x50, 0x36, 0x83, 0x80, 0x4e, 0x9c, 0xb0, + 0xa6, 0x8d, 0x6b, 0x6b, 0x82, 0x39, 0xbc, 0xc9, 0x78, 0xb0, 0x1f, 0x0a, 0x47, 0x04, 0x6f, 0x5e, + 0x1f, 0x3c, 0x87, 0x37, 0x19, 0x7e, 0x96, 0x73, 0x0f, 0xb7, 0xf8, 0x61, 0xb4, 0x24, 0x19, 0x65, + 0xdc, 0x44, 0xfc, 0x14, 0xee, 0x64, 0x05, 0x05, 0x72, 0x55, 0xf0, 0x81, 0x53, 0x11, 0xc1, 0xe3, + 0x8f, 0x08, 0x6e, 0xa6, 0xf6, 0x8f, 0xf7, 0x60, 0xb7, 0x7f, 0xdc, 0xeb, 0x6a, 0x46, 0xf7, 0xe4, + 0x6d, 0x4b, 0xd3, 0x8d, 0xc1, 0xb0, 0x39, 0x3c, 0x19, 0x18, 0x27, 0xdd, 0x41, 0x5f, 0x3b, 0x68, + 0x1f, 0xb5, 0xb5, 0xc3, 0x6a, 0x01, 0x3f, 0x04, 0x25, 0x0b, 0xd4, 0x3c, 0x18, 0xb6, 0xbf, 0xd6, + 0xaa, 0x08, 0xef, 0xc2, 0x4e, 0x96, 0xbf, 0xaf, 0x75, 0x0f, 0xdb, 0xdd, 0xd7, 0x55, 0x09, 0xd7, + 0xe0, 0x7e, 0x16, 0x40, 0xd7, 0x3a, 0x5a, 0x73, 0xa0, 0x1d, 0x56, 0x8b, 0x79, 0x29, 0x7a, 0x47, + 0x47, 0x9d, 0x76, 0x57, 0xab, 0xae, 0x3c, 0xfe, 0x19, 0xc1, 0xd6, 0x15, 0x85, 0xe3, 0x07, 0xb0, + 0xbd, 0x10, 0x34, 0x7c, 0xd7, 0xd7, 0x8c, 0x93, 0xee, 0x9b, 0x6e, 0xef, 0x9b, 0x6e, 0xb5, 0x80, + 0xef, 0x83, 0x9c, 0x76, 0xbf, 0xed, 0xb5, 0xda, 0x1d, 0x5e, 0xf4, 0x0e, 0xdc, 0x4b, 0x7b, 0x3b, + 0xbd, 0x83, 0x66, 0xa7, 0x2a, 0xa5, 0xca, 0x11, 0xce, 0x61, 0xaf, 0xd3, 0x31, 0x8e, 0x74, 0x4d, + 0xab, 0x16, 0xf7, 0xff, 0x58, 0x01, 0x9c, 0x64, 0x93, 0xf8, 0xe7, 0xd4, 0x22, 0xd8, 0x00, 0x9c, + 0x7e, 0xce, 0x61, 0x35, 0x16, 0x60, 0xee, 0x73, 0x56, 0xd9, 0x5b, 0x8a, 0x89, 0x5a, 0x50, 0x01, + 0x8f, 0xe0, 0x56, 0xc6, 0x83, 0x08, 0x5f, 0x46, 0xe7, 0x3f, 0xe0, 0x94, 0x4f, 0x96, 0x83, 0xe2, + 0x35, 0xde, 0x41, 0xf5, 0xea, 0x23, 0x00, 0xd7, 0xe2, 0xd8, 0x9c, 0x47, 0x93, 0xf2, 0x68, 0x09, + 0x22, 0x4e, 0x3d, 0x80, 0xcd, 0xc5, 0x09, 0x89, 0x1f, 0xc6, 0x61, 0x99, 0x83, 0x5a, 0xd9, 0xcd, + 0xf5, 0xc7, 0x49, 0xbf, 0x87, 0x9b, 0xa9, 0x11, 0x83, 0x2f, 0xcb, 0xc9, 0x1b, 0x9f, 0x8a, 0xba, + 0x0c, 0x92, 0x64, 0x3c, 0x63, 0x2a, 0x24, 0x18, 0xcf, 0x1f, 0x44, 0x09, 0xc6, 0x97, 0x0d, 0x96, + 0x42, 0xeb, 0xe8, 0xbb, 0xbd, 0x09, 0x65, 0x67, 0xb3, 0x51, 0xc3, 0x72, 0xa7, 0x4f, 0xa2, 0x98, + 0xf0, 0xef, 0x92, 0xe5, 0xda, 0x73, 0xc3, 0x6f, 0xd2, 0x46, 0x87, 0x9e, 0x93, 0x37, 0xfc, 0x00, + 0xb9, 0xeb, 0x6f, 0x69, 0x33, 0xfa, 0x7e, 0xf5, 0x4a, 0x18, 0x46, 0x6b, 0x22, 0xe4, 0xd9, 0x3f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x27, 0xeb, 0x6b, 0x96, 0x0d, 0x00, 0x00, } diff --git a/livekit/logger/options.pb.go b/livekit/logger/options.pb.go index caa4bdbf9..53b675f0d 100644 --- a/livekit/logger/options.pb.go +++ b/livekit/logger/options.pb.go @@ -54,7 +54,7 @@ const file_logger_options_proto_rawDesc = "" + "\n" + "\x14logger/options.proto\x12\x06logger\x1a google/protobuf/descriptor.proto:7\n" + "\x06redact\x12\x1d.google.protobuf.FieldOptions\x18\xc1\xcd\x05 \x01(\bR\x06redact:D\n" + - "\rredact_format\x12\x1d.google.protobuf.FieldOptions\x18\xc2\xcd\x05 \x01(\tR\fredactFormatB,Z*github.com/livekit/protocol/livekit/loggerb\x06proto3" + "\rredact_format\x12\x1d.google.protobuf.FieldOptions\x18\xc2\xcd\x05 \x01(\tR\fredactFormatBMZ*github.com/livekit/protocol/livekit/logger\xaa\x02\rLiveKit.Proto\xea\x02\x0eLiveKit::Protob\x06proto3" var file_logger_options_proto_goTypes = []any{ (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions