summaryrefslogtreecommitdiff
path: root/src/server/client_commands.rs
diff options
context:
space:
mode:
authorCan Celik <ogulcancelik@gmail.com>2026-09-02 14:24:33 +0300
committerGitHub <noreply@github.com>2026-09-02 14:24:33 +0300
commit6c0bb273d5d5405a00985621b17e36f8b4d64609 (patch)
treeceef5ea8adf337bf3c1e977b133e76cb763c6f1b /src/server/client_commands.rs
parentcc88b3b8e5bb9f7d9f23ed6ae85a52fd7b5b9ed6 (diff)
feat: support independent multi-client tab views (#3526)
Diffstat (limited to 'src/server/client_commands.rs')
-rw-r--r--src/server/client_commands.rs30
1 files changed, 29 insertions, 1 deletions
diff --git a/src/server/client_commands.rs b/src/server/client_commands.rs
index 86243e31..34be0519 100644
--- a/src/server/client_commands.rs
+++ b/src/server/client_commands.rs
@@ -92,6 +92,20 @@ pub(crate) fn error_message(
}
}
+fn correlate_response_id(response: String, request_id: &str) -> String {
+ let Ok(mut value) = serde_json::from_str::<serde_json::Value>(&response) else {
+ return response;
+ };
+ let Some(id) = value.get_mut("id") else {
+ return response;
+ };
+ if id.as_str() == Some(request_id) {
+ return response;
+ }
+ *id = serde_json::Value::String(request_id.to_owned());
+ serde_json::to_string(&value).unwrap_or(response)
+}
+
pub(crate) fn spawn_response_waiter(
client_id: u64,
boot_id: String,
@@ -109,7 +123,7 @@ pub(crate) fn spawn_response_waiter(
"endpoint command ended without a response",
)
});
- let response = response.into_bytes();
+ let response = correlate_response_id(response, &request_id).into_bytes();
if response.is_empty() {
let _ = server_event_tx.blocking_send(
ServerEvent::ClientShellEndpointResponseChunkReady {
@@ -319,6 +333,20 @@ mod tests {
}
#[test]
+ fn endpoint_response_uses_the_client_request_id() {
+ let response = serde_json::json!({
+ "id": "endpoint:boot-a:7:client-shell:1",
+ "result": { "type": "ok" }
+ })
+ .to_string();
+
+ let correlated = correlate_response_id(response, "client-shell:1");
+ let decoded: serde_json::Value = serde_json::from_str(&correlated).expect("response json");
+
+ assert_eq!(decoded["id"], "client-shell:1");
+ }
+
+ #[test]
fn endpoint_responses_are_chunked_without_truncation() {
let (response_tx, response_rx) = mpsc::channel();
let (event_tx, mut event_rx) = tokio_mpsc::channel(8);