Add KillIngressSession

livekit · Jun 12, 2024 · eba7c0e · eba7c0e
1 parent fcde125
commit eba7c0e
Show file tree

Hide file tree

Showing 25 changed files with 424 additions and 218 deletions.
diff --git a/infra/link.pb.go b/infra/link.pb.go
diff --git a/infra/link_grpc.pb.go b/infra/link_grpc.pb.go
diff --git a/livekit/livekit_agent.pb.go b/livekit/livekit_agent.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_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_webhook.pb.go b/livekit/livekit_webhook.pb.go
diff --git a/protobufs/rpc/ingress.proto b/protobufs/rpc/ingress.proto
@@ -31,6 +31,16 @@ service IngressInternal {
     option (psrpc.options).multi = true;
     option (psrpc.options).topics = true;
   };
+
+  rpc KillIngressSession(KillIngressSessionRequest) returns (google.protobuf.Empty) {
+    option (psrpc.options) = {
+      topics: true
+      topic_params: {
+        names: ["ingress_id", "resource_id"]
+        typed: false
+      }
+    };
+  };
 }
 
 service IngressHandler {
@@ -52,7 +62,8 @@ service IngressHandler {
 message ListActiveIngressRequest {}
 
 message ListActiveIngressResponse {
-  repeated string ingress_ids = 1;
+  repeated string ingress_ids = 1 [deprecated = true];
+  repeated IngressSession ingress_sessions = 2;
 }
 
 message DeleteWHIPResourceRequest {
@@ -78,3 +89,13 @@ message StartIngressRequest {
   string ws_url = 3;
   map<string,string> logging_fields = 4;
 }
+
+message IngressSession {
+  string ingress_id = 1;
+  string resource_id = 2;
+}
+
+message KillIngressSessionRequest {
+  IngressSession session = 1;
+}
+
diff --git a/rpc/agent.pb.go b/rpc/agent.pb.go
diff --git a/rpc/analytics.pb.go b/rpc/analytics.pb.go
diff --git a/rpc/analytics_grpc.pb.go b/rpc/analytics_grpc.pb.go
diff --git a/rpc/egress.pb.go b/rpc/egress.pb.go