fix(codec): Fix streaming reponses w/ many status (#689)

Closes #681
This commit is contained in:
Lucio Franco
2021-07-01 10:25:43 -04:00
committed by GitHub
parent 2b60a00614
commit 737ace393d
8 changed files with 100 additions and 6 deletions
+1
View File
@@ -23,6 +23,7 @@ futures = "0.3"
tower = { version = "0.4", features = [] }
http-body = "0.4"
http = "0.2"
tracing-subscriber = "0.2"
[build-dependencies]
tonic-build = { path = "../../tonic-build" }
+1
View File
@@ -1,3 +1,4 @@
fn main() {
tonic_build::compile_protos("proto/test.proto").unwrap();
tonic_build::compile_protos("proto/stream.proto").unwrap();
}
@@ -0,0 +1,10 @@
syntax = "proto3";
package stream;
service TestStream {
rpc StreamCall(InputStream) returns (stream OutputStream);
}
message InputStream {}
message OutputStream {}
+1
View File
@@ -1,3 +1,4 @@
pub mod pb {
tonic::include_proto!("test");
tonic::include_proto!("stream");
}
+62 -1
View File
@@ -1,6 +1,9 @@
use bytes::Bytes;
use futures_util::FutureExt;
use integration_tests::pb::{test_client, test_server, Input, Output};
use integration_tests::pb::{
test_client, test_server, test_stream_client, test_stream_server, Input, InputStream, Output,
OutputStream,
};
use std::time::Duration;
use tokio::sync::oneshot;
use tonic::metadata::{MetadataMap, MetadataValue};
@@ -117,3 +120,61 @@ async fn status_with_metadata() {
jh.await.unwrap();
}
type Stream<T> = std::pin::Pin<
Box<dyn futures::Stream<Item = std::result::Result<T, Status>> + Send + Sync + 'static>,
>;
#[tokio::test]
async fn status_from_server_stream() {
trace_init();
struct Svc;
#[tonic::async_trait]
impl test_stream_server::TestStream for Svc {
type StreamCallStream = Stream<OutputStream>;
async fn stream_call(
&self,
_: Request<InputStream>,
) -> Result<Response<Self::StreamCallStream>, Status> {
let s = futures::stream::iter(vec![
Err::<OutputStream, _>(Status::unavailable("foo")),
Err::<OutputStream, _>(Status::unavailable("bar")),
]);
Ok(Response::new(Box::pin(s) as Self::StreamCallStream))
}
}
let svc = test_stream_server::TestStreamServer::new(Svc);
tokio::spawn(async move {
Server::builder()
.add_service(svc)
.serve("127.0.0.1:1339".parse().unwrap())
.await
.unwrap();
});
tokio::time::sleep(Duration::from_millis(100)).await;
let mut client = test_stream_client::TestStreamClient::connect("http://127.0.0.1:1339")
.await
.unwrap();
let mut stream = client
.stream_call(InputStream {})
.await
.unwrap()
.into_inner();
assert_eq!(stream.message().await.unwrap_err().message(), "foo");
assert_eq!(stream.message().await.unwrap(), None);
}
fn trace_init() {
let _ = tracing_subscriber::FmtSubscriber::builder()
.with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
.try_init();
}