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): handle http2 server ending stream (#26235)

Browse source 
Closes #24845
This commit is contained in:
Toby Ealden 2024-10-15 19:05:10 +01:00 committed by GitHub
parent 3888806169
commit c5a7f98d82
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -488,13 +488,11 @@ pub async fn op_http2_client_get_response_body_chunk(
loop { loop {
let result = 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 { if let Err(err) = result {
let reason = err.reason(); match err.reason() {
if let Some(reason) = reason { Some(Reason::NO_ERROR) => return Ok((None, true, false)),
if reason == Reason::CANCEL { Some(Reason::CANCEL) => return Ok((None, false, true)),
return Ok((None, false, true)); _ => return Err(err.into()),
}
} }
return Err(err.into());
} }
match result.unwrap() { match result.unwrap() {
DataOrTrailers::Data(data) => { DataOrTrailers::Data(data) => {

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

@ -882,6 +882,7 @@ export class ClientHttp2Stream extends Duplex {
trailersReady: false, trailersReady: false,
endAfterHeaders: false, endAfterHeaders: false,
shutdownWritableCalled: false, shutdownWritableCalled: false,
serverEndedCall: false,
}; };
this[kDenoResponse] = undefined; this[kDenoResponse] = undefined;
this[kDenoRid] = undefined; this[kDenoRid] = undefined;
@ -1109,7 +1110,9 @@ export class ClientHttp2Stream extends Duplex {
} }
debugHttp2(">>> chunk", chunk, finished, this[kDenoResponse].bodyRid); 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( const trailerList = await op_http2_client_get_response_trailers(
this[kDenoResponse].bodyRid, this[kDenoResponse].bodyRid,
); );
@ -1237,7 +1240,9 @@ export class ClientHttp2Stream extends Duplex {
this[kSession] = undefined; this[kSession] = undefined;
session[kMaybeDestroy](); session[kMaybeDestroy]();
callback(err); if (callback) {
callback(err);
}
} }
[kMaybeDestroy](code = constants.NGHTTP2_NO_ERROR) { [kMaybeDestroy](code = constants.NGHTTP2_NO_ERROR) {
@ -1280,6 +1285,9 @@ function shutdownWritable(stream, callback, streamRid) {
if (state.flags & STREAM_FLAGS_HAS_TRAILERS) { if (state.flags & STREAM_FLAGS_HAS_TRAILERS) {
onStreamTrailers(stream); onStreamTrailers(stream);
callback(); callback();
} else if (state.serverEndedCall) {
debugHttp2(">>> stream finished");
callback();
} else { } else {
op_http2_client_send_data(streamRid, new Uint8Array(), true) op_http2_client_send_data(streamRid, new Uint8Array(), true)
.then(() => { .then(() => {