Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ext/node): handle http2 server ending stream #26235

Merged
merged 3 commits into from
Oct 15, 2024
Merged

fix(ext/node): handle http2 server ending stream #26235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f003370
fix(ext/node): handle http2 NO_ERROR poll result
TobyEalden Oct 14, 2024
7fb85f9
fix(ext/node): handle http2 server ending stream
TobyEalden Oct 14, 2024
0cb35f7
revert whitespace format
TobyEalden Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ext/node/ops/http2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,13 +488,11 @@ pub async fn op_http2_client_get_response_body_chunk(
loop {
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));
}
match err.reason() {
Some(Reason::NO_ERROR) => return Ok((None, true, false)),
Some(Reason::CANCEL) => return Ok((None, false, true)),
_ => return Err(err.into()),
}
return Err(err.into());
}
match result.unwrap() {
DataOrTrailers::Data(data) => {
Expand Down
12 changes: 10 additions & 2 deletions ext/node/polyfills/http2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,6 +882,7 @@ export class ClientHttp2Stream extends Duplex {
trailersReady: false,
endAfterHeaders: false,
shutdownWritableCalled: false,
serverEndedCall: false,
};
this[kDenoResponse] = undefined;
this[kDenoRid] = undefined;
Expand Down Expand Up @@ -1109,7 +1110,9 @@ export class ClientHttp2Stream extends Duplex {
}

debugHttp2(">>> chunk", chunk, finished, this[kDenoResponse].bodyRid);
if (chunk === null) {
if (finished || chunk === null) {
this[kState].serverEndedCall = true;

const trailerList = await op_http2_client_get_response_trailers(
this[kDenoResponse].bodyRid,
);
Expand Down Expand Up @@ -1237,7 +1240,9 @@ export class ClientHttp2Stream extends Duplex {
this[kSession] = undefined;

session[kMaybeDestroy]();
callback(err);
if (callback) {
callback(err);
}
}

[kMaybeDestroy](code = constants.NGHTTP2_NO_ERROR) {
Expand Down Expand Up @@ -1280,6 +1285,9 @@ function shutdownWritable(stream, callback, streamRid) {
if (state.flags & STREAM_FLAGS_HAS_TRAILERS) {
onStreamTrailers(stream);
callback();
} else if (state.serverEndedCall) {
debugHttp2(">>> stream finished");
callback();
} else {
op_http2_client_send_data(streamRid, new Uint8Array(), true)
.then(() => {
Expand Down