fix: upgrade CLI to new backend API and WebSocket protocol

Cargo.toml

@@ -10,7 +10,7 @@ members = [
 opt-level = 1
 
 [workspace.package]
-version = "0.0.8-alpha"
+version = "0.0.9-beta"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/lag-app/cli"

crates/cli/src/api.rs

@@ -161,6 +161,23 @@ impl ApiClient {
     pub fn base_url(&self) -> &str {
         &self.base_url
     }
+
+    /// Fetch a messages endpoint that returns `{"messages": [...]}` or a bare array.
+    pub async fn get_messages(&mut self, path: &str) -> Result<Vec<serde_json::Value>> {
+        let val: serde_json::Value = self.get(path).await?;
+        Ok(extract_messages(val))
+    }
+}
+
+/// Extract messages from either `{"messages": [...]}` or a bare `[...]`.
+pub fn extract_messages(val: serde_json::Value) -> Vec<serde_json::Value> {
+    if let Some(arr) = val.as_array() {
+        arr.clone()
+    } else if let Some(arr) = val["messages"].as_array() {
+        arr.clone()
+    } else {
+        Vec::new()
+    }
 }
 
 async fn parse_response<T: DeserializeOwned>(resp: reqwest::Response) -> Result<T> {

crates/cli/src/cli.rs

@@ -64,6 +64,9 @@ pub enum Commands {
         /// Show room text chat alongside voice
         #[arg(long)]
         with_chat: bool,
+        /// Voice server region (e.g. eu, us)
+        #[arg(long)]
+        region: Option<String>,
     },
 
     /// Audio device configuration
@@ -176,6 +179,7 @@ impl Cli {
                 input_device,
                 output_device,
                 with_chat,
+                region,
             }) => {
                 crate::commands::join::run(
                     server,
@@ -185,6 +189,7 @@ impl Cli {
                     input_device,
                     output_device,
                     with_chat,
+                    region,
                 )
                 .await
             }
@@ -247,6 +252,7 @@ mod tests {
                 input_device,
                 output_device,
                 with_chat,
+                region,
             }) => {
                 assert_eq!(server, "my-server");
                 assert_eq!(room, "general");
@@ -255,6 +261,7 @@ mod tests {
                 assert_eq!(input_device.as_deref(), Some("Blue Yeti"));
                 assert_eq!(output_device.as_deref(), Some("Speakers"));
                 assert!(with_chat);
+                assert!(region.is_none());
             }
             _ => panic!("expected Join"),
         }

crates/cli/src/commands/chat.rs

@@ -51,8 +51,8 @@ async fn send_message(
 async fn open_chat(api: &mut ApiClient, server_query: &str, room_query: &str) -> Result<()> {
     let (server_id, room_id) = resolve_server_room(api, server_query, room_query).await?;
 
-    let messages: Vec<serde_json::Value> = api
-        .get(&format!(
+    let messages = api
+        .get_messages(&format!(
             "/servers/{}/rooms/{}/messages?limit=50",
             server_id, room_id
         ))
@@ -66,9 +66,8 @@ async fn open_chat(api: &mut ApiClient, server_query: &str, room_query: &str) ->
     }
 
     let mut ws = WsClient::connect(api.base_url(), api.access_token()).await?;
-    ws.send(WsClientMessage::SubscribeServerRoom {
-        server_id: server_id.clone(),
-        room_id: Some(room_id.clone()),
+    ws.send(WsClientMessage::SubscribeServers {
+        server_ids: vec![server_id.clone()],
     })?;
 
     terminal::enable_raw_mode()?;
@@ -82,18 +81,23 @@ async fn open_chat(api: &mut ApiClient, server_query: &str, room_query: &str) ->
             ws_msg = ws.recv() => {
                 match ws_msg {
                     Some(WsServerMessage::RoomMessage(val)) => {
-                        let msg_room_id = val["roomId"].as_str().unwrap_or("");
+                        let msg = if val.get("message").is_some() {
+                            val["message"].clone()
+                        } else {
+                            val
+                        };
+                        let msg_room_id = msg["roomId"].as_str().unwrap_or("");
                         if msg_room_id == room_id {
                             clear_line();
-                            print_message(&val);
+                            print_message(&msg);
                             print_prompt(&input_buf);
                         }
                     }
                     None => break,
                     _ => {}
                 }
             }
-            _ = async {
+            should_quit = async {
                 if event::poll(std::time::Duration::from_millis(50)).unwrap_or(false) {
                     if let Ok(Event::Key(key)) = event::read() {
                         match (key.code, key.modifiers) {
@@ -127,7 +131,9 @@ async fn open_chat(api: &mut ApiClient, server_query: &str, room_query: &str) ->
                     }
                 }
                 false
-            } => {}
+            } => {
+                if should_quit { break; }
+            }
         }
     }
 

crates/cli/src/commands/dms.rs

@@ -70,8 +70,8 @@ async fn open_dm(api: &mut ApiClient, username: &str) -> Result<()> {
     let conv_id = conv["id"].as_str().unwrap().to_string();
 
     // Load recent messages
-    let messages: Vec<serde_json::Value> = api
-        .get(&format!("/dms/{}/messages?limit=50", conv_id))
+    let messages = api
+        .get_messages(&format!("/dms/{}/messages?limit=50", conv_id))
         .await?;
 
     println!("-- DM with {} --", username);

crates/cli/src/commands/join.rs

@@ -13,6 +13,7 @@ use parking_lot::Mutex;
 use std::io::Write;
 use std::sync::Arc;
 
+#[allow(clippy::too_many_arguments)]
 pub async fn run(
     server: String,
     room: String,
@@ -21,6 +22,7 @@ pub async fn run(
     input_device: Option<String>,
     output_device: Option<String>,
     with_chat: bool,
+    region: Option<String>,
 ) -> Result<()> {
     let creds = auth::ensure_auth().await?;
     let mut api = ApiClient::new(creds)?;
@@ -30,11 +32,12 @@ pub async fn run(
         resolve_voice_room(&mut api, &server, &room).await?;
 
     // Get voice token
+    let body = match region {
+        Some(ref r) => serde_json::json!({ "region": r }),
+        None => serde_json::json!({}),
+    };
     let token_resp: serde_json::Value = api
-        .post(
-            &format!("/voice/rooms/{}/token", room_id),
-            &serde_json::json!({}),
-        )
+        .post(&format!("/voice/rooms/{}/token", room_id), &body)
         .await?;
 
     let voice_url = token_resp["voiceUrl"]
@@ -115,9 +118,8 @@ pub async fn run(
     // Optionally connect WS for chat
     let mut ws = if with_chat {
         let ws = WsClient::connect(api.base_url(), api.access_token()).await?;
-        ws.send(crate::ws::WsClientMessage::SubscribeServerRoom {
-            server_id: server_id.clone(),
-            room_id: Some(room_id.clone()),
+        ws.send(crate::ws::WsClientMessage::SubscribeServers {
+            server_ids: vec![server_id.clone()],
         })?;
         Some(ws)
     } else {
@@ -126,8 +128,8 @@ pub async fn run(
 
     if with_chat {
         // Load recent messages
-        let messages: Vec<serde_json::Value> = api
-            .get(&format!(
+        let messages = api
+            .get_messages(&format!(
                 "/servers/{}/rooms/{}/messages?limit=20",
                 server_id, room_id
             ))
@@ -196,8 +198,13 @@ pub async fn run(
                     }
                 } => {
                     if let Some(WsServerMessage::RoomMessage(val)) = ws_msg {
-                        let username = val["username"].as_str().unwrap_or("?");
-                        let content = val["content"].as_str().unwrap_or("");
+                        let msg = if val.get("message").is_some() {
+                            val["message"].clone()
+                        } else {
+                            val
+                        };
+                        let username = msg["username"].as_str().unwrap_or("?");
+                        let content = msg["content"].as_str().unwrap_or("");
                         println!("\r[chat] {}: {}\x1b[K", username, content);
                         if with_chat {
                             print!("> {}", input_buf);

crates/cli/src/commands/servers.rs

@@ -121,6 +121,7 @@ async fn interactive_room_picker_inner(
                 None,
                 None,
                 false,
+                None,
             )
             .await
         }
@@ -133,6 +134,7 @@ async fn interactive_room_picker_inner(
                 None,
                 None,
                 true,
+                None,
             )
             .await
         }