diff options
author | Satya Rohith <me@satyarohith.com> | 2024-05-23 23:01:20 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-23 23:01:20 +0530 |
commit | e450c6b7cb23be95862d48ef047490490391c9d9 (patch) | |
tree | d611ba4aa0f5922d144f4f67adf26a876b086e7a /ext/node/ops/http2.rs | |
parent | 0a30897925fd8940884231b97474f4ea76e5ed28 (diff) |
fix(ext/node): return cancelled flag in get_response_body_chunk op (#23962)
The flag lets us exit from read loop without throwing an error when
the stream is cancelled.
This fixes gRPC cancellation example.
Co-authored-by: Bartek IwaĆczuk <biwanczuk@gmail.com>
Diffstat (limited to 'ext/node/ops/http2.rs')
-rw-r--r-- | ext/node/ops/http2.rs | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/ext/node/ops/http2.rs b/ext/node/ops/http2.rs index e0de8e474..d51da3b43 100644 --- a/ext/node/ops/http2.rs +++ b/ext/node/ops/http2.rs @@ -24,6 +24,7 @@ use deno_core::ResourceId; use deno_net::raw::take_network_stream_resource; use deno_net::raw::NetworkStream; use h2; +use h2::Reason; use h2::RecvStream; use http_v02; use http_v02::request::Parts; @@ -496,7 +497,7 @@ fn poll_data_or_trailers( pub async fn op_http2_client_get_response_body_chunk( state: Rc<RefCell<OpState>>, #[smi] body_rid: ResourceId, -) -> Result<(Option<Vec<u8>>, bool), AnyError> { +) -> Result<(Option<Vec<u8>>, bool, bool), AnyError> { let resource = state .borrow() .resource_table @@ -504,9 +505,19 @@ pub async fn op_http2_client_get_response_body_chunk( let mut body = RcRef::map(&resource, |r| &r.body).borrow_mut().await; loop { - match poll_fn(|cx| poll_data_or_trailers(cx, &mut body)).await? { + let result = poll_fn(|cx| poll_data_or_trailers(cx, &mut body)).await; + if let Err(err) = result { + let reason = err.reason(); + if let Some(reason) = reason { + if reason == Reason::CANCEL { + return Ok((None, false, true)); + } + } + return Err(err.into()); + } + match result.unwrap() { DataOrTrailers::Data(data) => { - return Ok((Some(data.to_vec()), false)); + return Ok((Some(data.to_vec()), false, false)); } DataOrTrailers::Trailers(trailers) => { if let Some(trailers_tx) = RcRef::map(&resource, |r| &r.trailers_tx) @@ -524,7 +535,7 @@ pub async fn op_http2_client_get_response_body_chunk( .borrow_mut() .await .take(); - return Ok((None, true)); + return Ok((None, true, false)); } }; } |