Merge branch 'pr/285' into theo/ignore-fields

livekit · Jan 15, 2024 · 06f7c56 · 06f7c56
2 parents 53734b1 + 614bf43
commit 06f7c56
Show file tree

Hide file tree

Showing 4 changed files with 626 additions and 122 deletions.
diff --git a/livekit-protocol/generate_proto.sh b/livekit-protocol/generate_proto.sh
@@ -23,8 +23,9 @@ protoc \
     --prost_opt=compile_well_known_types \
     --prost_opt=extern_path=.google.protobuf=::pbjson_types \
     --prost-serde_out=$OUT_RUST \
+    --prost-serde_opt=ignore_unknown_fields \
     $PROTOCOL/livekit_egress.proto \
     $PROTOCOL/livekit_rtc.proto \
     $PROTOCOL/livekit_room.proto \
     $PROTOCOL/livekit_webhook.proto \
-    $PROTOCOL/livekit_models.proto 
+    $PROTOCOL/livekit_models.proto 
diff --git a/livekit-protocol/protocol b/livekit-protocol/protocol
diff --git a/livekit-protocol/src/livekit.rs b/livekit-protocol/src/livekit.rs
@@ -24,6 +24,8 @@ pub struct Room {
     pub num_publishers: u32,
     #[prost(bool, tag="10")]
     pub active_recording: bool,
+    #[prost(message, optional, tag="13")]
+    pub version: ::core::option::Option<TimedVersion>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -274,6 +276,8 @@ pub struct TrackInfo {
     pub encryption: i32,
     #[prost(string, tag="17")]
     pub stream: ::prost::alloc::string::String,
+    #[prost(message, optional, tag="18")]
+    pub version: ::core::option::Option<TimedVersion>,
 }
 /// provide information about available spatial layers
 #[allow(clippy::derive_partial_eq_without_eq)]
+17 −17		go.mod
+36 −37		go.sum
+1 −1		infra/link.pb.go
+1 −1		livekit/livekit_agent.pb.go
+519 −189		livekit/livekit_analytics.pb.go
+73 −2		livekit/livekit_analytics_grpc.pb.go
+1 −1		livekit/livekit_egress.pb.go
+1 −1		livekit/livekit_ingress.pb.go
+1 −1		livekit/livekit_internal.pb.go
+525 −501		livekit/livekit_models.pb.go
+1 −1		livekit/livekit_room.pb.go
+1 −1		livekit/livekit_rtc.pb.go
+1 −1		livekit/livekit_sip.pb.go
+1 −1		livekit/livekit_webhook.pb.go
+26 −1		livekit_analytics.proto
+3 −1		livekit_models.proto
+104 −0		logger/deferred.go
+26 −0		logger/deferred_test.go
+26 −5		logger/fieldsampler_test.go
+28 −0		logger/logger.go
+14 −6		redis/redis.go
+15 −7		rpc/agent.pb.go
+11 −0		rpc/agent.proto
+35 −20		rpc/agent.psrpc.go
+1 −1		rpc/egress.pb.go
+1 −1		rpc/ingress.pb.go
+1 −1		rpc/io.pb.go
+1 −1		rpc/participant.pb.go
+1 −1		rpc/room.pb.go
+1 −1		rpc/signal.pb.go
+16 −16		rpc/sip.pb.go
+1 −0		rpc/sip.proto
+40 −36		rpc/sip.psrpc.go
+1 −1		utils/lock_tracker.go
+23 −2		utils/protoproxy.go
+82 −57		utils/protoproxy_test.go
+49 −1		utils/timed_version.go
+4 −0		utils/timed_version_test.go