Antonio Scandurra created
Cargo.lock | 3
crates/live_kit_server/Cargo.toml | 3
crates/live_kit_server/src/api.rs | 92 +++++++++++++++++++++-----------
3 files changed, 65 insertions(+), 33 deletions(-)
@@ -3202,12 +3202,13 @@ name = "live_kit_server"
version = "0.1.0"
dependencies = [
"anyhow",
+ "futures 0.3.24",
"hmac 0.12.1",
- "hyper",
"jwt",
"prost 0.8.0",
"prost-build",
"prost-types 0.8.0",
+ "reqwest",
"serde",
"sha2 0.10.6",
]
@@ -10,11 +10,12 @@ doctest = false
[dependencies]
anyhow = "1.0.38"
+futures = "0.3"
hmac = "0.12"
jwt = "0.16"
-hyper = { version = "0.14", features = ["client", "http1"] }
prost = "0.8"
prost-types = "0.8"
+reqwest = "0.11"
serde = { version = "1.0", features = ["derive", "rc"] }
sha2 = "0.10"
@@ -1,21 +1,24 @@
use crate::{proto, token};
use anyhow::{anyhow, Result};
-use hyper::{client::HttpConnector, header::AUTHORIZATION, Method, Request, Uri};
+use prost::Message;
+use reqwest::header::CONTENT_TYPE;
use std::future::Future;
pub struct Client {
- http: hyper::Client<HttpConnector>,
- uri: Uri,
+ http: reqwest::Client,
+ uri: String,
key: String,
secret: String,
}
impl Client {
- pub fn new(uri: Uri, key: String, secret: String) -> Self {
- assert!(uri.scheme().is_some(), "base uri must have a scheme");
- assert!(uri.authority().is_some(), "base uri must have an authority");
+ pub fn new(mut uri: String, key: String, secret: String) -> Self {
+ if uri.ends_with('/') {
+ uri.pop();
+ }
+
Self {
- http: hyper::Client::new(),
+ http: reqwest::Client::new(),
uri,
key,
secret,
@@ -23,39 +26,66 @@ impl Client {
}
pub fn create_room(&self, name: String) -> impl Future<Output = Result<proto::Room>> {
- let token = token::create(
- &self.key,
- &self.secret,
- None,
+ self.request(
+ "twirp/livekit.RoomService/CreateRoom",
token::VideoGrant {
room_create: Some(true),
..Default::default()
},
+ proto::CreateRoomRequest {
+ name,
+ ..Default::default()
+ },
+ )
+ }
+
+ pub fn delete_room(&self, name: String) -> impl Future<Output = Result<()>> {
+ let response = self.request(
+ "twirp/livekit.RoomService/DeleteRoom",
+ token::VideoGrant {
+ room_create: Some(true),
+ ..Default::default()
+ },
+ proto::DeleteRoomRequest { room: name },
);
+ async move {
+ response.await?;
+ Ok(())
+ }
+ }
+ fn request<Req, Res>(
+ &self,
+ path: &str,
+ grant: token::VideoGrant,
+ body: Req,
+ ) -> impl Future<Output = Result<Res>>
+ where
+ Req: Message,
+ Res: Default + Message,
+ {
let client = self.http.clone();
- let uri = Uri::builder()
- .scheme(self.uri.scheme().unwrap().clone())
- .authority(self.uri.authority().unwrap().clone())
- .path_and_query("twirp/livekit.RoomService/CreateRoom")
- .build();
+ let token = token::create(&self.key, &self.secret, None, grant);
+ let uri = format!("{}/{}", self.uri, path);
async move {
let token = token?;
- let uri = uri?;
- let body = proto::CreateRoomRequest {
- name: todo!(),
- empty_timeout: todo!(),
- max_participants: todo!(),
- node_id: todo!(),
- metadata: todo!(),
- egress: todo!(),
- };
- let mut request = Request::builder()
- .uri(uri)
- .method(Method::POST)
- .header(AUTHORIZATION, format!("Bearer {}", token))
- .body(body);
- Err(anyhow!("yeah"))
+ let response = client
+ .post(&uri)
+ .header(CONTENT_TYPE, "application/protobuf")
+ .bearer_auth(token)
+ .body(body.encode_to_vec())
+ .send()
+ .await?;
+ if response.status().is_success() {
+ Ok(Res::decode(response.bytes().await?)?)
+ } else {
+ Err(anyhow!(
+ "POST {} failed with status code {:?}, {:?}",
+ uri,
+ response.status(),
+ response.text().await
+ ))
+ }
}
}
}