Skip to content

node:http2: send RST_STREAM when a server stream is reset #33380

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

Open
robobun wants to merge 2 commits into
base: main
Choose a base branch
from
Open

node:http2: send RST_STREAM when a server stream is reset #33380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6502029
http2: send RST_STREAM when a server stream is reset
robobun Sep 11, 2026
fbda71c
http2: end the stream on HEADERS when respond() follows end()
robobun Sep 11, 2026
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
56 changes: 39 additions & 17 deletions src/js/node/http2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2038,6 +2038,12 @@ enum StreamState {
// callback). Until then no 'error' listener can exist, so stream errors must not be emitted:
// node never constructs the JS stream object before a complete header block arrives.
Delivered = 1 << 8, // 100000000 = 256
// close()/destroy() scheduled an RST_STREAM: it replaces the stream's end-of-stream, so
// neither _final nor the last DATA frame may put an END_STREAM on the wire ahead of it.
Comment thread
robobun marked this conversation as resolved.
Resolved
RstPending = 1 << 9, // 1000000000 = 512
// The RST_STREAM went to the native side. close() and _destroy() each schedule one, and the
// native map-miss fallback would write it again once the first has evicted the stream.
Comment thread
robobun marked this conversation as resolved.
Resolved
RstSubmitted = 1 << 10, // 10000000000 = 1024
}
// native.writeStream() return-value flag (mirrors WRITE_FLUSHED_WITHOUT_CALLBACK in
// h2_frame_parser.rs): the chunk was handed to the socket without queueing and the engine did
Expand All @@ -2064,7 +2070,8 @@ function isFinalWrite(stream: Http2Stream, pendingLength: number) {
return (
(stream._writableState.ending || stream[kEndingWithChunk] === true) &&
stream.writableLength === pendingLength &&
!stream[bunHTTP2WaitForTrailers]
!stream[bunHTTP2WaitForTrailers] &&
(stream[bunHTTP2StreamStatus] & StreamState.RstPending) === 0
);
}

Expand Down Expand Up @@ -2204,8 +2211,9 @@ function markStreamClosed(stream: Http2Stream) {
markWritableDone(stream);
}
}
function rstNextTick(id: number, rstCode: number) {
const session = this as Http2Session;
function rstNextTick(this: Http2Stream, session: Http2Session, id: number, rstCode: number) {
if ((this[bunHTTP2StreamStatus] & StreamState.RstSubmitted) !== 0) return;
this[bunHTTP2StreamStatus] |= StreamState.RstSubmitted;
session[bunHTTP2Native]?.rstStream(id, rstCode);
}
// node streamOnPause/streamOnResume (lib/internal/http2/core.js): the readable's flow state
Expand All @@ -2225,7 +2233,7 @@ function streamOnResume(this: Http2Stream) {
// A close() on a stream that has not been submitted yet (no id): the RST_STREAM has to follow the
// HEADERS frame, which is sent when the queued request becomes ready (node's finishCloseStream).
function sendRstOnReady(this: Http2Stream, session: Http2Session, code: number) {
setImmediate(rstNextTick.bind(session, this.id, code));
setImmediate(rstNextTick.bind(this, session, this.id, code));
}
function uncorkNT(stream: Http2Stream) {
stream.uncork();
Expand Down Expand Up @@ -2537,6 +2545,7 @@ class Http2Stream extends Duplex {
this.push(null);
}
const { ending } = this._writableState;
this[bunHTTP2StreamStatus] |= StreamState.RstPending;
if (!ending) {
// If the writable side of the Http2Stream is still open, emit the
// 'aborted' event and set the aborted flag.
Expand All @@ -2553,9 +2562,9 @@ class Http2Stream extends Duplex {
// RST_STREAM has to be sent after the HEADERS frame, once the id is assigned.
this.once("ready", sendRstOnReady.bind(this, session, code));
} else if (this.writableFinished || code) {
setImmediate(rstNextTick.bind(session, this.#id, code));
setImmediate(rstNextTick.bind(this, session, this.#id, code));
} else {
this.once("finish", rstNextTick.bind(session, this.#id, code));
this.once("finish", rstNextTick.bind(this, session, this.#id, code));
}
// node destroys the stream once both halves have finished; without this a stream closed
// while idle never emits 'close'.
Expand All @@ -2582,6 +2591,7 @@ class Http2Stream extends Duplex {
this[kAborted] = true;
this.emit("aborted");
}
this[bunHTTP2StreamStatus] |= StreamState.RstPending;
// at this state destroyed will be true but we need to close the writable side
this._writableState.destroyed = false;
this.end();
Expand Down Expand Up @@ -2646,7 +2656,7 @@ class Http2Stream extends Duplex {
// the deferred rstStream would be a guaranteed no-op host call per request.
(rstCode !== 0 || (this[bunHTTP2StreamStatus] & StreamState.NativeClosed) === 0)
) {
setImmediate(rstNextTick.bind(session, this.#id, rstCode));
setImmediate(rstNextTick.bind(this, session, this.#id, rstCode));
}

// Diagnostics channels: published after the stream is closed and destroyed, with the same error
Expand Down Expand Up @@ -2687,15 +2697,24 @@ class Http2Stream extends Duplex {
if (session) {
const native = session[bunHTTP2Native];
if (native) {
if (this instanceof ServerHttp2Stream && !this.headersSent && (this.id & 1) === 0) {
// A locally-pushed (even-id) stream ended before respond() (HEAD/endStream pushes): an
// empty DATA frame would precede the response HEADERS on the wire. respond() forces
// endStream for these streams, so END_STREAM rides on the HEADERS frame and the
// onStreamEnd(5) dispatch completes this callback through markWritableDone.
this[bunHTTP2StreamFinal] = callback;
if (this instanceof ServerHttp2Stream && !this.headersSent) {
// RFC 9113 §8.1: a response begins with HEADERS, so DATA here is a connection error.
// A pushed stream (even id) stashes the callback for the respond() that follows; a
// client-initiated stream just settles the writable, with any reset already scheduled.
Comment thread
robobun marked this conversation as resolved.
Resolved
if ((this.id & 1) === 0) {
this[bunHTTP2StreamFinal] = callback;
} else {
this[bunHTTP2StreamStatus] |= StreamState.FinalCalled | StreamState.WritableClosed;
callback();
}
Comment thread
robobun marked this conversation as resolved.
Resolved
return;
}
this[bunHTTP2StreamStatus] |= StreamState.FinalCalled;
if ((this[bunHTTP2StreamStatus] & StreamState.RstPending) !== 0) {
this[bunHTTP2StreamStatus] |= StreamState.WritableClosed;
callback();
return;
}
// When waitForTrailers is active, writing an empty DATA frame with
// close=true emits a bare empty DATA frame (flags=0) to the wire
// before the trailer/noTrailers path runs, which then emits ANOTHER
Expand Down Expand Up @@ -3320,7 +3339,7 @@ class ServerHttp2Stream extends Http2Stream {
}

respondWithFile(path, headers, options) {
if (this.destroyed) {
if (this.destroyed || this.closed || this.session === undefined) {
throw $ERR_HTTP2_INVALID_STREAM();
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
if (this.headersSent) throw $ERR_HTTP2_HEADERS_SENT();
Expand Down Expand Up @@ -3380,7 +3399,7 @@ class ServerHttp2Stream extends Http2Stream {
throw err;
}
}
if (this.destroyed) {
if (this.destroyed || this.closed || this.session === undefined) {
throw $ERR_HTTP2_INVALID_STREAM();
}
if (this.headersSent) throw $ERR_HTTP2_HEADERS_SENT();
Expand Down Expand Up @@ -3507,7 +3526,7 @@ class ServerHttp2Stream extends Http2Stream {
session[bunHTTP2Native]?.request(this.id, undefined, headers, sensitiveNames);
}
respond(headers: any, options?: any) {
if (this.destroyed || this.session === undefined) {
if (this.destroyed || this.closed || this.session === undefined) {
throw $ERR_HTTP2_INVALID_STREAM();
}

Expand Down Expand Up @@ -3613,7 +3632,10 @@ class ServerHttp2Stream extends Http2Stream {
statusCode === HTTP_STATUS_NO_CONTENT ||
statusCode === HTTP_STATUS_RESET_CONTENT ||
statusCode === HTTP_STATUS_NOT_MODIFIED ||
this.headRequest === true
this.headRequest === true ||
// end() ran before any HEADERS went out, so _final settled the writable without a frame
// and nothing else will end the stream (node: SubmitResponse sets EMPTY_PAYLOAD).
Comment thread
robobun marked this conversation as resolved.
Resolved
(this[bunHTTP2StreamStatus] & StreamState.WritableClosed) !== 0
) {
// When endStream is true the HEADERS frame itself carries END_STREAM
// and the stream moves to HALF_CLOSED_LOCAL inside native request().
Expand Down
7 changes: 7 additions & 0 deletions src/runtime/api/bun/h2_frame_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4194,6 +4194,13 @@ impl crate::api::h2::connection::Sink for H2FrameParser {
JSValue::UNDEFINED,
JSValue::js_number(old_state as f64),
);
} else if code == ErrorCode::NO_ERROR.0 {
// A NO_ERROR reset is a clean end of stream: 'end' then 'close', no 'error'.
self.dispatch_with_extra(
JSH2FrameParser::Gc::onStreamEnd,
stream_ctx,
JSValue::js_number(StreamState::CLOSED as u8 as f64),
);
} else {
self.dispatch_with_extra(
JSH2FrameParser::Gc::onStreamError,
Expand Down
Loading
Loading