fix: streamable http client close on response (#268)
This commit is contained in:
parent
b9bba0be15
commit
4c34b64b7f
1 changed files with 9 additions and 1 deletions
|
|
@ -211,6 +211,7 @@ impl<C: StreamableHttpClient> StreamableHttpClientWorker<C> {
|
||||||
+ Send
|
+ Send
|
||||||
+ 'static,
|
+ 'static,
|
||||||
sse_worker_tx: tokio::sync::mpsc::Sender<ServerJsonRpcMessage>,
|
sse_worker_tx: tokio::sync::mpsc::Sender<ServerJsonRpcMessage>,
|
||||||
|
close_on_response: bool,
|
||||||
ct: CancellationToken,
|
ct: CancellationToken,
|
||||||
) -> Result<(), StreamableHttpError<C::Error>> {
|
) -> Result<(), StreamableHttpError<C::Error>> {
|
||||||
let mut sse_stream = std::pin::pin!(sse_stream);
|
let mut sse_stream = std::pin::pin!(sse_stream);
|
||||||
|
|
@ -227,12 +228,16 @@ impl<C: StreamableHttpClient> StreamableHttpClientWorker<C> {
|
||||||
let Some(message) = message.transpose()? else {
|
let Some(message) = message.transpose()? else {
|
||||||
break;
|
break;
|
||||||
};
|
};
|
||||||
|
let is_response = matches!(message, ServerJsonRpcMessage::Response(_));
|
||||||
let yield_result = sse_worker_tx.send(message).await;
|
let yield_result = sse_worker_tx.send(message).await;
|
||||||
if yield_result.is_err() {
|
if yield_result.is_err() {
|
||||||
tracing::trace!("streamable http transport worker dropped, exiting");
|
tracing::trace!("streamable http transport worker dropped, exiting");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
if close_on_response && is_response {
|
||||||
|
tracing::debug!("got response, closing sse stream");
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
@ -363,6 +368,7 @@ impl<C: StreamableHttpClient> Worker for StreamableHttpClientWorker<C> {
|
||||||
streams.spawn(Self::execute_sse_stream(
|
streams.spawn(Self::execute_sse_stream(
|
||||||
sse_stream,
|
sse_stream,
|
||||||
sse_worker_tx.clone(),
|
sse_worker_tx.clone(),
|
||||||
|
false,
|
||||||
transport_task_ct.child_token(),
|
transport_task_ct.child_token(),
|
||||||
));
|
));
|
||||||
tracing::debug!("got common stream");
|
tracing::debug!("got common stream");
|
||||||
|
|
@ -439,6 +445,7 @@ impl<C: StreamableHttpClient> Worker for StreamableHttpClientWorker<C> {
|
||||||
streams.spawn(Self::execute_sse_stream(
|
streams.spawn(Self::execute_sse_stream(
|
||||||
sse_stream,
|
sse_stream,
|
||||||
sse_worker_tx.clone(),
|
sse_worker_tx.clone(),
|
||||||
|
true,
|
||||||
transport_task_ct.child_token(),
|
transport_task_ct.child_token(),
|
||||||
));
|
));
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -449,6 +456,7 @@ impl<C: StreamableHttpClient> Worker for StreamableHttpClientWorker<C> {
|
||||||
streams.spawn(Self::execute_sse_stream(
|
streams.spawn(Self::execute_sse_stream(
|
||||||
sse_stream,
|
sse_stream,
|
||||||
sse_worker_tx.clone(),
|
sse_worker_tx.clone(),
|
||||||
|
true,
|
||||||
transport_task_ct.child_token(),
|
transport_task_ct.child_token(),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue