foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/node): return cancelled flag in get_response_body_chunk op (#23962)

Browse source 
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>
This commit is contained in:
Satya Rohith 2024-05-23 23:01:20 +05:30 committed by GitHub
parent 0a30897925
commit e450c6b7cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ext/node/ops/http2.rs
View file

@ -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));
}
};
}

7
ext/node/polyfills/http2.ts
View file

@ -1007,10 +1007,15 @@ export class ClientHttp2Stream extends Duplex {
debugHttp2(">>> read");
(async () => {
const [chunk, finished] = await op_http2_client_get_response_body_chunk(
const [chunk, finished, cancelled] =
await op_http2_client_get_response_body_chunk(
this[kDenoResponse].bodyRid,
);
if (cancelled) {
return;
}
debugHttp2(">>> chunk", chunk, finished, this[kDenoResponse].bodyRid);
if (chunk === null) {
const trailerList = await op_http2_client_get_response_trailers(