adding room configuration in SIP dispatch rule (#923)

* adding room configuration in SIP dispatch rule * generated protobuf * changeset * generated protobuf * add to io.proto * fix imports * generated protobuf * pass along room preset and config details * comment about token flow * generated protobuf --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
livekit · Dec 25, 2024 · 2c4895f · 2c4895f
1 parent 970d4dc
commit 2c4895f
Show file tree

Hide file tree

Showing 34 changed files with 1,081 additions and 968 deletions.
diff --git a/.changeset/gentle-houses-grin.md b/.changeset/gentle-houses-grin.md
@@ -0,0 +1,6 @@
+---
+"github.com/livekit/protocol": patch
+"@livekit/protocol": patch
+---
+
+Allow SIP inbound to specify room configuration
diff --git a/infra/link.pb.go b/infra/link.pb.go
diff --git a/livekit/livekit_agent.pb.go b/livekit/livekit_agent.pb.go
diff --git a/livekit/livekit_agent_dispatch.pb.go b/livekit/livekit_agent_dispatch.pb.go
diff --git a/livekit/livekit_analytics.pb.go b/livekit/livekit_analytics.pb.go
diff --git a/livekit/livekit_egress.pb.go b/livekit/livekit_egress.pb.go
diff --git a/livekit/livekit_ingress.pb.go b/livekit/livekit_ingress.pb.go
diff --git a/livekit/livekit_internal.pb.go b/livekit/livekit_internal.pb.go
diff --git a/livekit/livekit_metrics.pb.go b/livekit/livekit_metrics.pb.go
diff --git a/livekit/livekit_models.pb.go b/livekit/livekit_models.pb.go
diff --git a/livekit/livekit_room.pb.go b/livekit/livekit_room.pb.go
diff --git a/livekit/livekit_rtc.pb.go b/livekit/livekit_rtc.pb.go
diff --git a/livekit/livekit_sip.pb.go b/livekit/livekit_sip.pb.go
diff --git a/livekit/livekit_sip.twirp.go b/livekit/livekit_sip.twirp.go
diff --git a/livekit/livekit_webhook.pb.go b/livekit/livekit_webhook.pb.go
diff --git a/protobufs/livekit_sip.proto b/protobufs/livekit_sip.proto
@@ -23,6 +23,7 @@ option ruby_package = "LiveKit::Proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/empty.proto";
 import "livekit_models.proto";
+import "livekit_room.proto";
 
 /*
    LiveKit's SIP API is built with 3 high level primitives
@@ -385,7 +386,13 @@ message CreateSIPDispatchRuleRequest {
   // Participants created by this rule will inherit these attributes.
   map<string, string> attributes = 7;
 
-  // NEXT ID: 8
+  // Cloud-only, config preset to use
+  string room_preset = 8;
+
+  // RoomConfiguration to use if the participant initiates the room
+  RoomConfiguration room_config = 9;
+
+  // NEXT ID: 10
 }
 
 message SIPDispatchRuleInfo {
@@ -405,7 +412,12 @@ message SIPDispatchRuleInfo {
   // Participants created by this rule will inherit these attributes.
   map<string, string> attributes = 8;
 
-  // NEXT ID: 9
+  // Cloud-only, config preset to use
+  string room_preset = 9;
+
+  // RoomConfiguration to use if the participant initiates the room
+  RoomConfiguration room_config = 10;
+  // NEXT ID: 11
 }
 
 // ListSIPDispatchRuleRequest lists dispatch rules for given filters. If no filters are set, all rules are listed.

diff --git a/protobufs/rpc/io.proto b/protobufs/rpc/io.proto
@@ -21,6 +21,7 @@ option go_package = "github.com/livekit/protocol/rpc";
 import "livekit_egress.proto";
 import "livekit_ingress.proto";
 import "livekit_sip.proto";
+import "livekit_room.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/duration.proto";
 
@@ -186,7 +187,13 @@ message EvaluateSIPDispatchRulesResponse {
   // Max call duration.
   google.protobuf.Duration max_call_duration = 17;
 
-  // NEXT ID: 20
+  // Room preset and config are used only to generate tokens
+  // once tokens are returned by this response consistently, it will no longer
+  // be needed
+  string room_preset = 20;
+  livekit.RoomConfiguration room_config = 21;
+
+  // NEXT ID: 22
 }
 
 message UpdateSIPCallStateRequest {

diff --git a/rpc/agent.pb.go b/rpc/agent.pb.go
diff --git a/rpc/agent_dispatch.pb.go b/rpc/agent_dispatch.pb.go
diff --git a/rpc/analytics.pb.go b/rpc/analytics.pb.go
diff --git a/rpc/egress.pb.go b/rpc/egress.pb.go
diff --git a/rpc/ingress.pb.go b/rpc/ingress.pb.go