Improve gateway reliability and client e2e coverage

clients/rust/crates/mxgw-cli/src/main.rs

@@ -92,6 +92,30 @@ enum Command {
         #[arg(long)]
         json: bool,
     },
+    SubscribeBulk {
+        #[command(flatten)]
+        connection: ConnectionArgs,
+        #[arg(long)]
+        session_id: String,
+        #[arg(long)]
+        server_handle: i32,
+        #[arg(long, value_delimiter = ',')]
+        items: Vec<String>,
+        #[arg(long)]
+        json: bool,
+    },
+    UnsubscribeBulk {
+        #[command(flatten)]
+        connection: ConnectionArgs,
+        #[arg(long)]
+        session_id: String,
+        #[arg(long)]
+        server_handle: i32,
+        #[arg(long, value_delimiter = ',')]
+        item_handles: Vec<i32>,
+        #[arg(long)]
+        json: bool,
+    },
     StreamEvents {
         #[command(flatten)]
         connection: ConnectionArgs,
@@ -103,6 +127,8 @@ enum Command {
         max_events: usize,
         #[arg(long)]
         json: bool,
+        #[arg(long)]
+        jsonl: bool,
     },
     Write {
         #[command(flatten)]
@@ -226,7 +252,7 @@ async fn main() -> ExitCode {
 
 async fn run(cli: Cli) -> Result<(), Error> {
     match cli.command {
-        Command::Version { json } => print_version(json),
+        Command::Version { json, .. } => print_version(json),
         Command::Ping {
             connection,
             message,
@@ -323,6 +349,30 @@ async fn run(cli: Cli) -> Result<(), Error> {
             session.advise(server_handle, item_handle).await?;
             print_ok("advise", json);
         }
+        Command::SubscribeBulk {
+            connection,
+            session_id,
+            server_handle,
+            items,
+            json,
+        } => {
+            let session = session_for(connection, session_id).await?;
+            let results = session.subscribe_bulk(server_handle, items).await?;
+            print_bulk_results("subscribe-bulk", &results, json);
+        }
+        Command::UnsubscribeBulk {
+            connection,
+            session_id,
+            server_handle,
+            item_handles,
+            json,
+        } => {
+            let session = session_for(connection, session_id).await?;
+            let results = session
+                .unsubscribe_bulk(server_handle, item_handles)
+                .await?;
+            print_bulk_results("unsubscribe-bulk", &results, json);
+        }
         Command::StreamEvents {
             connection,
             session_id,
@@ -527,6 +577,33 @@ fn print_ok(operation: &str, use_json: bool) {
     }
 }
 
+fn print_bulk_results(
+    operation: &str,
+    results: &[mxgateway_client::generated::mxaccess_gateway::v1::SubscribeResult],
+    use_json: bool,
+) {
+    if use_json {
+        let results_json: Vec<_> = results
+            .iter()
+            .map(|result| {
+                json!({
+                    "serverHandle": result.server_handle,
+                    "tagAddress": result.tag_address,
+                    "itemHandle": result.item_handle,
+                    "wasSuccessful": result.was_successful,
+                    "errorMessage": result.error_message,
+                })
+            })
+            .collect();
+        println!(
+            "{}",
+            json!({ "operation": operation, "results": results_json })
+        );
+    } else {
+        println!("{}", results.len());
+    }
+}
+
 fn parse_value(value_type: CliValueType, value: &str) -> Result<MxValue, Error> {
     let parsed = match value_type {
         CliValueType::Bool => MxValue::bool(parse_cli_value(value)?),