quic: extract transport logic from Application to Session#64127

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

Merged
nodejs-github-bot merged 5 commits into from
Jul 8, 2026
+608 −562
Merged

quic: extract transport logic from Application to Session #64127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eef9fce
quic: extract transport logic from Application to Session
pimterry Jun 25, 2026
e36fa90
fixup! quic: extract transport logic from Application to Session
pimterry Jul 7, 2026
423e261
fixup! quic: extract transport logic from Application to Session
pimterry Jul 7, 2026
157417a
fixup! quic: extract transport logic from Application to Session
pimterry Jul 7, 2026
fa84d48
fixup! quic: extract transport logic from Application to Session
pimterry Jul 7, 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
12 changes: 6 additions & 6 deletions src/quic/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ data channels that carry application data.

Every entry point that may generate outbound data creates a
`SendPendingDataScope`. Scopes nest — an internal depth counter ensures
`Application::SendPendingData()` is called exactly once, when the outermost
`Session::SendPendingData()` is called exactly once, when the outermost
scope exits:

```cpp
Expand DownExpand Up@@ -218,13 +218,13 @@ Session::Receive()

```text
SendPendingDataScope::~SendPendingDataScope()
→ Application::SendPendingData()
→ Session::SendPendingData()
Loop (up to max_packet_count):
├── GetStreamData() // pull data from next stream
│ └── stream->Pull() // bob pull from Outbound→DataQueue
├── WriteVStream() // ngtcp2_conn_writev_stream()
├── application().GetStreamData() // pull data from next stream
│ └── stream->Pull() // bob pull from Outbound→DataQueue
├── WriteVStream() // ngtcp2_conn_writev_stream()
│ encrypts, frames, paces
├── if ndatalen > 0: StreamCommit()
├── if ndatalen > 0: application().StreamCommit()
│ stream->Commit(datalen, fin)
├── if nwrite > 0: Send() // uv_udp_send()
├── if WRITE_MORE: continue // room for more in this packet
Expand Down
455 changes: 6 additions & 449 deletions src/quic/application.cc
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 0 additions & 56 deletions src/quic/application.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,10 +205,6 @@ class Session::Application : public MemoryRetainer {
return false;
}

// Signals to the Application that it should serialize and transmit any
// pending session and stream packets it has accumulated.
void SendPendingData();

// Returns true if the application protocol supports sending and
// receiving headers on streams (e.g. HTTP/3). Applications that
// do not support headers should return false (the default).
Expand DownExpand Up@@ -243,10 +239,6 @@ class Session::Application : public MemoryRetainer {
return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
}

// The StreamData struct is used by the application to pass pending stream
// data to the session for transmission.
struct StreamData;

virtual int GetStreamData(StreamData* data) = 0;
virtual bool StreamCommit(StreamData* data, size_t datalen) = 0;

Expand All@@ -262,57 +254,9 @@ class Session::Application : public MemoryRetainer {
}

private:
Packet::Ptr CreateStreamDataPacket();

// Tries to pack a pending datagram into the current packet buffer.
// If < 0 is returned, either NGTCP2_ERR_WRITE_MORE or a fatal error is
// returned; the caller must check. If > 0 is returned, the packet is done
// and the value is the size of the finalized packet. If 0 is returned,
// the datagram is either congestion limited or was abandoned
ssize_t TryWritePendingDatagram(PathStorage* path,
uint8_t* dest,
size_t destlen,
uint64_t ts);

// Write the given stream_data into the buffer. The PacketInfo out-param
// is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)
// that should be applied when sending the packet.
ssize_t WriteVStream(PathStorage* path,
PacketInfo* pi,
uint8_t* buf,
ssize_t* ndatalen,
size_t max_packet_size,
const StreamData& stream_data,
uint64_t ts);

Session* session_ = nullptr;
};

struct Session::Application::StreamData final {
// The actual number of vectors in the struct, up to kMaxVectorCount.
size_t count = 0;
// The stream identifier. If this is a negative value then no stream is
// identified.
stream_id id = -1;
int fin = 0;
ngtcp2_vec data[kMaxVectorCount]{};
BaseObjectPtr<Stream> stream;

static_assert(sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
"ngtcp2_vec and nghttp3_vec must have identical layout");
inline operator nghttp3_vec*() {
return reinterpret_cast<nghttp3_vec*>(data);
}

inline operator const ngtcp2_vec*() const { return data; }
inline operator ngtcp2_vec*() { return data; }

std::string ToString() const;
};

// Create a DefaultApplication for the given session.
std::unique_ptr<Session::Application> CreateDefaultApplication(
Session* session, const Session::Application_Options& options);
Expand Down
86 changes: 40 additions & 46 deletions src/quic/http3.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -209,24 +209,25 @@ class Http3ApplicationImpl final : public Session::Application {
started_ = true;
Debug(&session(), "Starting HTTP/3 application.");

auto params = ngtcp2_conn_get_remote_transport_params(session());
if (params == nullptr) [[unlikely]] {
const auto params = session().remote_transport_params();
if (!params) [[unlikely]] {
// The params are not available yet. Cannot start.
Debug(&session(),
"Cannot start HTTP/3 application yet. No remote transport params");
return false;
}

if (params->initial_max_streams_uni < 3) {
if (params.initial_max_streams_uni() < 3) {
// HTTP3 requires 3 unidirectional control streams to be opened in each
// direction in additional to the bidirectional streams that are used to
// actually carry request and response payload back and forth.
// See:
// https://nghttp2.org/nghttp3/programmers-guide.html#binding-control-streams
Debug(&session(),
"Cannot start HTTP/3 application. Initial max "
"unidirectional streams [%zu] is too low. Must be at least 3",
params->initial_max_streams_uni);
"unidirectional streams [%" PRIu64
"] is too low. Must be at least 3",
params.initial_max_streams_uni());
return false;
}

Expand All@@ -235,17 +236,14 @@ class Http3ApplicationImpl final : public Session::Application {
// of requests that the client can actually created.
if (session().is_server()) {
nghttp3_conn_set_max_client_streams_bidi(
*this, params->initial_max_streams_bidi);
*this, params.initial_max_streams_bidi());
}

Debug(&session(), "Creating and binding HTTP/3 control streams");
bool ret =
ngtcp2_conn_open_uni_stream(session(), &control_stream_id_, nullptr) ==
0 &&
ngtcp2_conn_open_uni_stream(
session(), &qpack_enc_stream_id_, nullptr) == 0 &&
ngtcp2_conn_open_uni_stream(
session(), &qpack_dec_stream_id_, nullptr) == 0 &&
session().OpenUnidirectionalStream(&control_stream_id_) &&
session().OpenUnidirectionalStream(&qpack_enc_stream_id_) &&
session().OpenUnidirectionalStream(&qpack_dec_stream_id_) &&
nghttp3_conn_bind_control_stream(*this, control_stream_id_) == 0 &&
nghttp3_conn_bind_qpack_streams(
*this, qpack_enc_stream_id_, qpack_dec_stream_id_) == 0;
Expand DownExpand Up@@ -306,8 +304,7 @@ class Http3ApplicationImpl final : public Session::Application {
Debug(&session(),
"Extending stream and connection offset by %zd bytes",
nread);
session().ExtendStreamOffset(id, nread);
session().ExtendOffset(nread);
session().Consume(id, nread);
}

// If this data arrived as 0-RTT, mark the stream. We set it after
Expand DownExpand Up@@ -365,24 +362,11 @@ class Http3ApplicationImpl final : public Session::Application {
case EndpointLabel::LOCAL:
return;
case EndpointLabel::REMOTE: {
switch (direction) {
case Direction::BIDIRECTIONAL: {
Debug(&session(),
"HTTP/3 application extending max bidi streams by %" PRIu64,
max_streams);
ngtcp2_conn_extend_max_streams_bidi(
session(), static_cast<size_t>(max_streams));
break;
}
case Direction::UNIDIRECTIONAL: {
Debug(&session(),
"HTTP/3 application extending max uni streams by %" PRIu64,
max_streams);
ngtcp2_conn_extend_max_streams_uni(
session(), static_cast<size_t>(max_streams));
break;
}
}
Debug(&session(),
"HTTP/3 application extending max %s streams by %" PRIu64,
direction == Direction::BIDIRECTIONAL ? "bidi" : "uni",
max_streams);
session().ExtendMaxStreams(direction, max_streams);
}
}
}
Expand DownExpand Up@@ -530,8 +514,7 @@ class Http3ApplicationImpl final : public Session::Application {
return;
}

session().SetLastError(
QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
session().Close();
}

Expand All@@ -548,8 +531,7 @@ class Http3ApplicationImpl final : public Session::Application {
return;
}

session().SetLastError(
QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
session().Close();
}

Expand DownExpand Up@@ -687,17 +669,30 @@ class Http3ApplicationImpl final : public Session::Application {
return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
}

int GetStreamData(StreamData* data) override {
int GetStreamData(Session::StreamData* data) override {
static_assert(
sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
"ngtcp2_vec and nghttp3_vec must have identical layout");
data->count = kMaxVectorCount;
ssize_t ret = 0;
Debug(&session(), "HTTP/3 application getting stream data");
if (conn_ && session().max_data_left()) {
ret = nghttp3_conn_writev_stream(
*this, &data->id, &data->fin, *data, data->count);
// nghttp3 reports fin through an int out-param; bridge it to the bool.
int fin = 0;
ret =
nghttp3_conn_writev_stream(*this,
&data->id,
&fin,
reinterpret_cast<nghttp3_vec*>(data->data),
data->count);
// A negative return value indicates an error.
if (ret < 0) {
return static_cast<int>(ret);
}
data->fin = fin != 0;

data->count = static_cast<size_t>(ret);
if (data->id >= 0 && data->id != control_stream_id_ &&
Expand All@@ -710,7 +705,7 @@ class Http3ApplicationImpl final : public Session::Application {
return 0;
}

bool StreamCommit(StreamData* data, size_t datalen) override {
bool StreamCommit(Session::StreamData* data, size_t datalen) override {
Debug(&session(),
"HTTP/3 application committing stream %" PRIi64 " data %zu",
data->id,
Expand All@@ -720,8 +715,7 @@ class Http3ApplicationImpl final : public Session::Application {
// nghttp3 tracks its own offset via add_write_offset.
int err = nghttp3_conn_add_write_offset(*this, data->id, datalen);
if (err != 0) {
session().SetLastError(QuicError::ForApplication(
nghttp3_err_infer_quic_app_error_code(err)));
session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(err));
return false;
}
// Raw application bytes are committed to the stream's outbound
Expand DownExpand Up@@ -1211,10 +1205,10 @@ class Http3ApplicationImpl final : public Session::Application {
void* conn_user_data,
void* stream_user_data) {
NGHTTP3_CALLBACK_SCOPE(app);
auto& session = app.session();
Debug(&session, "HTTP/3 application deferred consume %zu bytes", consumed);
session.ExtendStreamOffset(id, consumed);
session.ExtendOffset(consumed);
Debug(&app.session(),
"HTTP/3 application deferred consume %zu bytes",
consumed);
app.session().Consume(id, consumed);
return NGTCP2_SUCCESS;
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
quic: extract transport logic from Application to Session#64127

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

 Merged

nodejs-github-bot
merged 5 commits into

from

Jul 8, 2026

+608

−562

 Merged


quic: extract transport logic from Application to Session
#64127
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
eef9fce

quic: extract transport logic from Application to Session


pimterry Jun 25, 2026
e36fa90

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
423e261

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
157417a

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
fa84d48

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 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


12 changes: 6 additions & 6 deletions
src/quic/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ data channels that carry application data.

Every entry point that may generate outbound data creates a
`SendPendingDataScope`. Scopes nest — an internal depth counter ensures
`Application::SendPendingData()` is called exactly once, when the outermost
`Session::SendPendingData()` is called exactly once, when the outermost
scope exits:

```cpp
Expand DownExpand Up@@ -218,13 +218,13 @@ Session::Receive()

```text
SendPendingDataScope::~SendPendingDataScope()
 → Application::SendPendingData()
 → Session::SendPendingData()
 Loop (up to max_packet_count):
 ├── GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 ├── application().GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 │ encrypts, frames, paces
 ├── if ndatalen > 0: StreamCommit()
 ├── if ndatalen > 0: application().StreamCommit()
 │ stream->Commit(datalen, fin)
 ├── if nwrite > 0: Send() // uv_udp_send()
 ├── if WRITE_MORE: continue // room for more in this packet
Expand Down

455 changes: 6 additions & 449 deletions
src/quic/application.cc

View file


Open in desktop


Large diffs are not rendered by default.


56 changes: 0 additions & 56 deletions
src/quic/application.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,10 +205,6 @@ class Session::Application : public MemoryRetainer {
 return false;
 }

 // Signals to the Application that it should serialize and transmit any
 // pending session and stream packets it has accumulated.
 void SendPendingData();

 // Returns true if the application protocol supports sending and
 // receiving headers on streams (e.g. HTTP/3). Applications that
 // do not support headers should return false (the default).
Expand DownExpand Up@@ -243,10 +239,6 @@ class Session::Application : public MemoryRetainer {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 // The StreamData struct is used by the application to pass pending stream
 // data to the session for transmission.
 struct StreamData;

 virtual int GetStreamData(StreamData* data) = 0;
 virtual bool StreamCommit(StreamData* data, size_t datalen) = 0;

Expand All@@ -262,57 +254,9 @@ class Session::Application : public MemoryRetainer {
 }

 private:
 Packet::Ptr CreateStreamDataPacket();

 // Tries to pack a pending datagram into the current packet buffer.
 // If < 0 is returned, either NGTCP2_ERR_WRITE_MORE or a fatal error is
 // returned; the caller must check. If > 0 is returned, the packet is done
 // and the value is the size of the finalized packet. If 0 is returned,
 // the datagram is either congestion limited or was abandoned
 ssize_t TryWritePendingDatagram(PathStorage* path,
 uint8_t* dest,
 size_t destlen,
 uint64_t ts);

 // Write the given stream_data into the buffer. The PacketInfo out-param
 // is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)
 // that should be applied when sending the packet.
 ssize_t WriteVStream(PathStorage* path,
 PacketInfo* pi,
 uint8_t* buf,
 ssize_t* ndatalen,
 size_t max_packet_size,
 const StreamData& stream_data,
 uint64_t ts);

 Session* session_ = nullptr;
};

struct Session::Application::StreamData final {
 // The actual number of vectors in the struct, up to kMaxVectorCount.
 size_t count = 0;
 // The stream identifier. If this is a negative value then no stream is
 // identified.
 stream_id id = -1;
 int fin = 0;
 ngtcp2_vec data[kMaxVectorCount]{};
 BaseObjectPtr<Stream> stream;

 static_assert(sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 inline operator nghttp3_vec*() {
 return reinterpret_cast<nghttp3_vec*>(data);
 }

 inline operator const ngtcp2_vec*() const { return data; }
 inline operator ngtcp2_vec*() { return data; }

 std::string ToString() const;
};

// Create a DefaultApplication for the given session.
std::unique_ptr<Session::Application> CreateDefaultApplication(
 Session* session, const Session::Application_Options& options);
Expand Down

86 changes: 40 additions & 46 deletions
src/quic/http3.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,24 +209,25 @@ class Http3ApplicationImpl final : public Session::Application {
 started_ = true;
 Debug(&session(), "Starting HTTP/3 application.");

 auto params = ngtcp2_conn_get_remote_transport_params(session());
 if (params == nullptr) [[unlikely]] {
const auto params = session().remote_transport_params();
 if (!params) [[unlikely]] {
 // The params are not available yet. Cannot start.
 Debug(&session(),
 "Cannot start HTTP/3 application yet. No remote transport params");
 return false;
 }

 if (params->initial_max_streams_uni < 3) {
 if (params.initial_max_streams_uni() < 3) {
 // HTTP3 requires 3 unidirectional control streams to be opened in each
 // direction in additional to the bidirectional streams that are used to
 // actually carry request and response payload back and forth.
 // See:
 // https://nghttp2.org/nghttp3/programmers-guide.html#binding-control-streams
 Debug(&session(),
 "Cannot start HTTP/3 application. Initial max "
 "unidirectional streams [%zu] is too low. Must be at least 3",
 params->initial_max_streams_uni);
 "unidirectional streams [%" PRIu64
 "] is too low. Must be at least 3",
 params.initial_max_streams_uni());
 return false;
 }

Expand All@@ -235,17 +236,14 @@ class Http3ApplicationImpl final : public Session::Application {
 // of requests that the client can actually created.
 if (session().is_server()) {
 nghttp3_conn_set_max_client_streams_bidi(
 *this, params->initial_max_streams_bidi);
 *this, params.initial_max_streams_bidi());
 }

 Debug(&session(), "Creating and binding HTTP/3 control streams");
 bool ret =
 ngtcp2_conn_open_uni_stream(session(), &control_stream_id_, nullptr) ==
 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_enc_stream_id_, nullptr) == 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_dec_stream_id_, nullptr) == 0 &&
 session().OpenUnidirectionalStream(&control_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_enc_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_dec_stream_id_) &&
 nghttp3_conn_bind_control_stream(*this, control_stream_id_) == 0 &&
 nghttp3_conn_bind_qpack_streams(
 *this, qpack_enc_stream_id_, qpack_dec_stream_id_) == 0;
Expand DownExpand Up@@ -306,8 +304,7 @@ class Http3ApplicationImpl final : public Session::Application {
 Debug(&session(),
 "Extending stream and connection offset by %zd bytes",
 nread);
 session().ExtendStreamOffset(id, nread);
 session().ExtendOffset(nread);
 session().Consume(id, nread);
 }

 // If this data arrived as 0-RTT, mark the stream. We set it after
Expand DownExpand Up@@ -365,24 +362,11 @@ class Http3ApplicationImpl final : public Session::Application {
 case EndpointLabel::LOCAL:
 return;
 case EndpointLabel::REMOTE: {
 switch (direction) {
 case Direction::BIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max bidi streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_bidi(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 case Direction::UNIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max uni streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_uni(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 }
 Debug(&session(),
 "HTTP/3 application extending max %s streams by %" PRIu64,
 direction == Direction::BIDIRECTIONAL ? "bidi" : "uni",
 max_streams);
 session().ExtendMaxStreams(direction, max_streams);
 }
 }
 }
Expand DownExpand Up@@ -530,8 +514,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand All@@ -548,8 +531,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand DownExpand Up@@ -687,17 +669,30 @@ class Http3ApplicationImpl final : public Session::Application {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 int GetStreamData(StreamData* data) override {
 int GetStreamData(Session::StreamData* data) override {
 static_assert(
 sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 data->count = kMaxVectorCount;
 ssize_t ret = 0;
 Debug(&session(), "HTTP/3 application getting stream data");
 if (conn_ && session().max_data_left()) {
 ret = nghttp3_conn_writev_stream(
 *this, &data->id, &data->fin, *data, data->count);
 // nghttp3 reports fin through an int out-param; bridge it to the bool.
 int fin = 0;
 ret =
 nghttp3_conn_writev_stream(*this,
 &data->id,
 &fin,
 reinterpret_cast<nghttp3_vec*>(data->data),
 data->count);
 // A negative return value indicates an error.
 if (ret < 0) {
 return static_cast<int>(ret);
 }
 data->fin = fin != 0;

 data->count = static_cast<size_t>(ret);
 if (data->id >= 0 && data->id != control_stream_id_ &&
Expand All@@ -710,7 +705,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return 0;
 }

 bool StreamCommit(StreamData* data, size_t datalen) override {
 bool StreamCommit(Session::StreamData* data, size_t datalen) override {
 Debug(&session(),
 "HTTP/3 application committing stream %" PRIi64 " data %zu",
 data->id,
Expand All@@ -720,8 +715,7 @@ class Http3ApplicationImpl final : public Session::Application {
 // nghttp3 tracks its own offset via add_write_offset.
 int err = nghttp3_conn_add_write_offset(*this, data->id, datalen);
 if (err != 0) {
 session().SetLastError(QuicError::ForApplication(
 nghttp3_err_infer_quic_app_error_code(err)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(err));
 return false;
 }
 // Raw application bytes are committed to the stream's outbound
Expand DownExpand Up@@ -1211,10 +1205,10 @@ class Http3ApplicationImpl final : public Session::Application {
 void* conn_user_data,
 void* stream_user_data) {
 NGHTTP3_CALLBACK_SCOPE(app);
auto& session = app.session();
Debug(&session, "HTTP/3 application deferred consume %zu bytes", consumed);
session.ExtendStreamOffset(id, consumed);
 session.ExtendOffset(consumed);
Debug(&app.session(),
"HTTP/3 application deferred consume %zu bytes",
 consumed);
app.session().Consume(id, consumed);
 return NGTCP2_SUCCESS;
 }

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
quic: extract transport logic from Application to Session#64127

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

 Merged

nodejs-github-bot
merged 5 commits into

from

Jul 8, 2026

+608

−562

 Merged


quic: extract transport logic from Application to Session
#64127
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
eef9fce

quic: extract transport logic from Application to Session


pimterry Jun 25, 2026
e36fa90

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
423e261

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
157417a

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
fa84d48

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 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


12 changes: 6 additions & 6 deletions
src/quic/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ data channels that carry application data.

Every entry point that may generate outbound data creates a
`SendPendingDataScope`. Scopes nest — an internal depth counter ensures
`Application::SendPendingData()` is called exactly once, when the outermost
`Session::SendPendingData()` is called exactly once, when the outermost
scope exits:

```cpp
Expand DownExpand Up@@ -218,13 +218,13 @@ Session::Receive()

```text
SendPendingDataScope::~SendPendingDataScope()
 → Application::SendPendingData()
 → Session::SendPendingData()
 Loop (up to max_packet_count):
 ├── GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 ├── application().GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 │ encrypts, frames, paces
 ├── if ndatalen > 0: StreamCommit()
 ├── if ndatalen > 0: application().StreamCommit()
 │ stream->Commit(datalen, fin)
 ├── if nwrite > 0: Send() // uv_udp_send()
 ├── if WRITE_MORE: continue // room for more in this packet
Expand Down

455 changes: 6 additions & 449 deletions
src/quic/application.cc

View file


Open in desktop


Large diffs are not rendered by default.


56 changes: 0 additions & 56 deletions
src/quic/application.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,10 +205,6 @@ class Session::Application : public MemoryRetainer {
 return false;
 }

 // Signals to the Application that it should serialize and transmit any
 // pending session and stream packets it has accumulated.
 void SendPendingData();

 // Returns true if the application protocol supports sending and
 // receiving headers on streams (e.g. HTTP/3). Applications that
 // do not support headers should return false (the default).
Expand DownExpand Up@@ -243,10 +239,6 @@ class Session::Application : public MemoryRetainer {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 // The StreamData struct is used by the application to pass pending stream
 // data to the session for transmission.
 struct StreamData;

 virtual int GetStreamData(StreamData* data) = 0;
 virtual bool StreamCommit(StreamData* data, size_t datalen) = 0;

Expand All@@ -262,57 +254,9 @@ class Session::Application : public MemoryRetainer {
 }

 private:
 Packet::Ptr CreateStreamDataPacket();

 // Tries to pack a pending datagram into the current packet buffer.
 // If < 0 is returned, either NGTCP2_ERR_WRITE_MORE or a fatal error is
 // returned; the caller must check. If > 0 is returned, the packet is done
 // and the value is the size of the finalized packet. If 0 is returned,
 // the datagram is either congestion limited or was abandoned
 ssize_t TryWritePendingDatagram(PathStorage* path,
 uint8_t* dest,
 size_t destlen,
 uint64_t ts);

 // Write the given stream_data into the buffer. The PacketInfo out-param
 // is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)
 // that should be applied when sending the packet.
 ssize_t WriteVStream(PathStorage* path,
 PacketInfo* pi,
 uint8_t* buf,
 ssize_t* ndatalen,
 size_t max_packet_size,
 const StreamData& stream_data,
 uint64_t ts);

 Session* session_ = nullptr;
};

struct Session::Application::StreamData final {
 // The actual number of vectors in the struct, up to kMaxVectorCount.
 size_t count = 0;
 // The stream identifier. If this is a negative value then no stream is
 // identified.
 stream_id id = -1;
 int fin = 0;
 ngtcp2_vec data[kMaxVectorCount]{};
 BaseObjectPtr<Stream> stream;

 static_assert(sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 inline operator nghttp3_vec*() {
 return reinterpret_cast<nghttp3_vec*>(data);
 }

 inline operator const ngtcp2_vec*() const { return data; }
 inline operator ngtcp2_vec*() { return data; }

 std::string ToString() const;
};

// Create a DefaultApplication for the given session.
std::unique_ptr<Session::Application> CreateDefaultApplication(
 Session* session, const Session::Application_Options& options);
Expand Down

86 changes: 40 additions & 46 deletions
src/quic/http3.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,24 +209,25 @@ class Http3ApplicationImpl final : public Session::Application {
 started_ = true;
 Debug(&session(), "Starting HTTP/3 application.");

 auto params = ngtcp2_conn_get_remote_transport_params(session());
 if (params == nullptr) [[unlikely]] {
const auto params = session().remote_transport_params();
 if (!params) [[unlikely]] {
 // The params are not available yet. Cannot start.
 Debug(&session(),
 "Cannot start HTTP/3 application yet. No remote transport params");
 return false;
 }

 if (params->initial_max_streams_uni < 3) {
 if (params.initial_max_streams_uni() < 3) {
 // HTTP3 requires 3 unidirectional control streams to be opened in each
 // direction in additional to the bidirectional streams that are used to
 // actually carry request and response payload back and forth.
 // See:
 // https://nghttp2.org/nghttp3/programmers-guide.html#binding-control-streams
 Debug(&session(),
 "Cannot start HTTP/3 application. Initial max "
 "unidirectional streams [%zu] is too low. Must be at least 3",
 params->initial_max_streams_uni);
 "unidirectional streams [%" PRIu64
 "] is too low. Must be at least 3",
 params.initial_max_streams_uni());
 return false;
 }

Expand All@@ -235,17 +236,14 @@ class Http3ApplicationImpl final : public Session::Application {
 // of requests that the client can actually created.
 if (session().is_server()) {
 nghttp3_conn_set_max_client_streams_bidi(
 *this, params->initial_max_streams_bidi);
 *this, params.initial_max_streams_bidi());
 }

 Debug(&session(), "Creating and binding HTTP/3 control streams");
 bool ret =
 ngtcp2_conn_open_uni_stream(session(), &control_stream_id_, nullptr) ==
 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_enc_stream_id_, nullptr) == 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_dec_stream_id_, nullptr) == 0 &&
 session().OpenUnidirectionalStream(&control_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_enc_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_dec_stream_id_) &&
 nghttp3_conn_bind_control_stream(*this, control_stream_id_) == 0 &&
 nghttp3_conn_bind_qpack_streams(
 *this, qpack_enc_stream_id_, qpack_dec_stream_id_) == 0;
Expand DownExpand Up@@ -306,8 +304,7 @@ class Http3ApplicationImpl final : public Session::Application {
 Debug(&session(),
 "Extending stream and connection offset by %zd bytes",
 nread);
 session().ExtendStreamOffset(id, nread);
 session().ExtendOffset(nread);
 session().Consume(id, nread);
 }

 // If this data arrived as 0-RTT, mark the stream. We set it after
Expand DownExpand Up@@ -365,24 +362,11 @@ class Http3ApplicationImpl final : public Session::Application {
 case EndpointLabel::LOCAL:
 return;
 case EndpointLabel::REMOTE: {
 switch (direction) {
 case Direction::BIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max bidi streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_bidi(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 case Direction::UNIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max uni streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_uni(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 }
 Debug(&session(),
 "HTTP/3 application extending max %s streams by %" PRIu64,
 direction == Direction::BIDIRECTIONAL ? "bidi" : "uni",
 max_streams);
 session().ExtendMaxStreams(direction, max_streams);
 }
 }
 }
Expand DownExpand Up@@ -530,8 +514,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand All@@ -548,8 +531,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand DownExpand Up@@ -687,17 +669,30 @@ class Http3ApplicationImpl final : public Session::Application {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 int GetStreamData(StreamData* data) override {
 int GetStreamData(Session::StreamData* data) override {
 static_assert(
 sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 data->count = kMaxVectorCount;
 ssize_t ret = 0;
 Debug(&session(), "HTTP/3 application getting stream data");
 if (conn_ && session().max_data_left()) {
 ret = nghttp3_conn_writev_stream(
 *this, &data->id, &data->fin, *data, data->count);
 // nghttp3 reports fin through an int out-param; bridge it to the bool.
 int fin = 0;
 ret =
 nghttp3_conn_writev_stream(*this,
 &data->id,
 &fin,
 reinterpret_cast<nghttp3_vec*>(data->data),
 data->count);
 // A negative return value indicates an error.
 if (ret < 0) {
 return static_cast<int>(ret);
 }
 data->fin = fin != 0;

 data->count = static_cast<size_t>(ret);
 if (data->id >= 0 && data->id != control_stream_id_ &&
Expand All@@ -710,7 +705,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return 0;
 }

 bool StreamCommit(StreamData* data, size_t datalen) override {
 bool StreamCommit(Session::StreamData* data, size_t datalen) override {
 Debug(&session(),
 "HTTP/3 application committing stream %" PRIi64 " data %zu",
 data->id,
Expand All@@ -720,8 +715,7 @@ class Http3ApplicationImpl final : public Session::Application {
 // nghttp3 tracks its own offset via add_write_offset.
 int err = nghttp3_conn_add_write_offset(*this, data->id, datalen);
 if (err != 0) {
 session().SetLastError(QuicError::ForApplication(
 nghttp3_err_infer_quic_app_error_code(err)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(err));
 return false;
 }
 // Raw application bytes are committed to the stream's outbound
Expand DownExpand Up@@ -1211,10 +1205,10 @@ class Http3ApplicationImpl final : public Session::Application {
 void* conn_user_data,
 void* stream_user_data) {
 NGHTTP3_CALLBACK_SCOPE(app);
auto& session = app.session();
Debug(&session, "HTTP/3 application deferred consume %zu bytes", consumed);
session.ExtendStreamOffset(id, consumed);
 session.ExtendOffset(consumed);
Debug(&app.session(),
"HTTP/3 application deferred consume %zu bytes",
 consumed);
app.session().Consume(id, consumed);
 return NGTCP2_SUCCESS;
 }

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
quic: extract transport logic from Application to Session#64127

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

 Merged

nodejs-github-bot
merged 5 commits into

from

Jul 8, 2026

+608

−562

 Merged


quic: extract transport logic from Application to Session
#64127
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
eef9fce

quic: extract transport logic from Application to Session


pimterry Jun 25, 2026
e36fa90

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
423e261

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
157417a

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
fa84d48

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 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


12 changes: 6 additions & 6 deletions
src/quic/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ data channels that carry application data.

Every entry point that may generate outbound data creates a
`SendPendingDataScope`. Scopes nest — an internal depth counter ensures
`Application::SendPendingData()` is called exactly once, when the outermost
`Session::SendPendingData()` is called exactly once, when the outermost
scope exits:

```cpp
Expand DownExpand Up@@ -218,13 +218,13 @@ Session::Receive()

```text
SendPendingDataScope::~SendPendingDataScope()
 → Application::SendPendingData()
 → Session::SendPendingData()
 Loop (up to max_packet_count):
 ├── GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 ├── application().GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 │ encrypts, frames, paces
 ├── if ndatalen > 0: StreamCommit()
 ├── if ndatalen > 0: application().StreamCommit()
 │ stream->Commit(datalen, fin)
 ├── if nwrite > 0: Send() // uv_udp_send()
 ├── if WRITE_MORE: continue // room for more in this packet
Expand Down

455 changes: 6 additions & 449 deletions
src/quic/application.cc

View file


Open in desktop


Large diffs are not rendered by default.


56 changes: 0 additions & 56 deletions
src/quic/application.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,10 +205,6 @@ class Session::Application : public MemoryRetainer {
 return false;
 }

 // Signals to the Application that it should serialize and transmit any
 // pending session and stream packets it has accumulated.
 void SendPendingData();

 // Returns true if the application protocol supports sending and
 // receiving headers on streams (e.g. HTTP/3). Applications that
 // do not support headers should return false (the default).
Expand DownExpand Up@@ -243,10 +239,6 @@ class Session::Application : public MemoryRetainer {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 // The StreamData struct is used by the application to pass pending stream
 // data to the session for transmission.
 struct StreamData;

 virtual int GetStreamData(StreamData* data) = 0;
 virtual bool StreamCommit(StreamData* data, size_t datalen) = 0;

Expand All@@ -262,57 +254,9 @@ class Session::Application : public MemoryRetainer {
 }

 private:
 Packet::Ptr CreateStreamDataPacket();

 // Tries to pack a pending datagram into the current packet buffer.
 // If < 0 is returned, either NGTCP2_ERR_WRITE_MORE or a fatal error is
 // returned; the caller must check. If > 0 is returned, the packet is done
 // and the value is the size of the finalized packet. If 0 is returned,
 // the datagram is either congestion limited or was abandoned
 ssize_t TryWritePendingDatagram(PathStorage* path,
 uint8_t* dest,
 size_t destlen,
 uint64_t ts);

 // Write the given stream_data into the buffer. The PacketInfo out-param
 // is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)
 // that should be applied when sending the packet.
 ssize_t WriteVStream(PathStorage* path,
 PacketInfo* pi,
 uint8_t* buf,
 ssize_t* ndatalen,
 size_t max_packet_size,
 const StreamData& stream_data,
 uint64_t ts);

 Session* session_ = nullptr;
};

struct Session::Application::StreamData final {
 // The actual number of vectors in the struct, up to kMaxVectorCount.
 size_t count = 0;
 // The stream identifier. If this is a negative value then no stream is
 // identified.
 stream_id id = -1;
 int fin = 0;
 ngtcp2_vec data[kMaxVectorCount]{};
 BaseObjectPtr<Stream> stream;

 static_assert(sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 inline operator nghttp3_vec*() {
 return reinterpret_cast<nghttp3_vec*>(data);
 }

 inline operator const ngtcp2_vec*() const { return data; }
 inline operator ngtcp2_vec*() { return data; }

 std::string ToString() const;
};

// Create a DefaultApplication for the given session.
std::unique_ptr<Session::Application> CreateDefaultApplication(
 Session* session, const Session::Application_Options& options);
Expand Down

86 changes: 40 additions & 46 deletions
src/quic/http3.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,24 +209,25 @@ class Http3ApplicationImpl final : public Session::Application {
 started_ = true;
 Debug(&session(), "Starting HTTP/3 application.");

 auto params = ngtcp2_conn_get_remote_transport_params(session());
 if (params == nullptr) [[unlikely]] {
const auto params = session().remote_transport_params();
 if (!params) [[unlikely]] {
 // The params are not available yet. Cannot start.
 Debug(&session(),
 "Cannot start HTTP/3 application yet. No remote transport params");
 return false;
 }

 if (params->initial_max_streams_uni < 3) {
 if (params.initial_max_streams_uni() < 3) {
 // HTTP3 requires 3 unidirectional control streams to be opened in each
 // direction in additional to the bidirectional streams that are used to
 // actually carry request and response payload back and forth.
 // See:
 // https://nghttp2.org/nghttp3/programmers-guide.html#binding-control-streams
 Debug(&session(),
 "Cannot start HTTP/3 application. Initial max "
 "unidirectional streams [%zu] is too low. Must be at least 3",
 params->initial_max_streams_uni);
 "unidirectional streams [%" PRIu64
 "] is too low. Must be at least 3",
 params.initial_max_streams_uni());
 return false;
 }

Expand All@@ -235,17 +236,14 @@ class Http3ApplicationImpl final : public Session::Application {
 // of requests that the client can actually created.
 if (session().is_server()) {
 nghttp3_conn_set_max_client_streams_bidi(
 *this, params->initial_max_streams_bidi);
 *this, params.initial_max_streams_bidi());
 }

 Debug(&session(), "Creating and binding HTTP/3 control streams");
 bool ret =
 ngtcp2_conn_open_uni_stream(session(), &control_stream_id_, nullptr) ==
 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_enc_stream_id_, nullptr) == 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_dec_stream_id_, nullptr) == 0 &&
 session().OpenUnidirectionalStream(&control_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_enc_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_dec_stream_id_) &&
 nghttp3_conn_bind_control_stream(*this, control_stream_id_) == 0 &&
 nghttp3_conn_bind_qpack_streams(
 *this, qpack_enc_stream_id_, qpack_dec_stream_id_) == 0;
Expand DownExpand Up@@ -306,8 +304,7 @@ class Http3ApplicationImpl final : public Session::Application {
 Debug(&session(),
 "Extending stream and connection offset by %zd bytes",
 nread);
 session().ExtendStreamOffset(id, nread);
 session().ExtendOffset(nread);
 session().Consume(id, nread);
 }

 // If this data arrived as 0-RTT, mark the stream. We set it after
Expand DownExpand Up@@ -365,24 +362,11 @@ class Http3ApplicationImpl final : public Session::Application {
 case EndpointLabel::LOCAL:
 return;
 case EndpointLabel::REMOTE: {
 switch (direction) {
 case Direction::BIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max bidi streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_bidi(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 case Direction::UNIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max uni streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_uni(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 }
 Debug(&session(),
 "HTTP/3 application extending max %s streams by %" PRIu64,
 direction == Direction::BIDIRECTIONAL ? "bidi" : "uni",
 max_streams);
 session().ExtendMaxStreams(direction, max_streams);
 }
 }
 }
Expand DownExpand Up@@ -530,8 +514,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand All@@ -548,8 +531,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand DownExpand Up@@ -687,17 +669,30 @@ class Http3ApplicationImpl final : public Session::Application {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 int GetStreamData(StreamData* data) override {
 int GetStreamData(Session::StreamData* data) override {
 static_assert(
 sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 data->count = kMaxVectorCount;
 ssize_t ret = 0;
 Debug(&session(), "HTTP/3 application getting stream data");
 if (conn_ && session().max_data_left()) {
 ret = nghttp3_conn_writev_stream(
 *this, &data->id, &data->fin, *data, data->count);
 // nghttp3 reports fin through an int out-param; bridge it to the bool.
 int fin = 0;
 ret =
 nghttp3_conn_writev_stream(*this,
 &data->id,
 &fin,
 reinterpret_cast<nghttp3_vec*>(data->data),
 data->count);
 // A negative return value indicates an error.
 if (ret < 0) {
 return static_cast<int>(ret);
 }
 data->fin = fin != 0;

 data->count = static_cast<size_t>(ret);
 if (data->id >= 0 && data->id != control_stream_id_ &&
Expand All@@ -710,7 +705,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return 0;
 }

 bool StreamCommit(StreamData* data, size_t datalen) override {
 bool StreamCommit(Session::StreamData* data, size_t datalen) override {
 Debug(&session(),
 "HTTP/3 application committing stream %" PRIi64 " data %zu",
 data->id,
Expand All@@ -720,8 +715,7 @@ class Http3ApplicationImpl final : public Session::Application {
 // nghttp3 tracks its own offset via add_write_offset.
 int err = nghttp3_conn_add_write_offset(*this, data->id, datalen);
 if (err != 0) {
 session().SetLastError(QuicError::ForApplication(
 nghttp3_err_infer_quic_app_error_code(err)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(err));
 return false;
 }
 // Raw application bytes are committed to the stream's outbound
Expand DownExpand Up@@ -1211,10 +1205,10 @@ class Http3ApplicationImpl final : public Session::Application {
 void* conn_user_data,
 void* stream_user_data) {
 NGHTTP3_CALLBACK_SCOPE(app);
auto& session = app.session();
Debug(&session, "HTTP/3 application deferred consume %zu bytes", consumed);
session.ExtendStreamOffset(id, consumed);
 session.ExtendOffset(consumed);
Debug(&app.session(),
"HTTP/3 application deferred consume %zu bytes",
 consumed);
app.session().Consume(id, consumed);
 return NGTCP2_SUCCESS;
 }

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
quic: extract transport logic from Application to Session#64127

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

 Merged

nodejs-github-bot
merged 5 commits into

from

Jul 8, 2026

+608

−562

 Merged


quic: extract transport logic from Application to Session
#64127
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
eef9fce

quic: extract transport logic from Application to Session


pimterry Jun 25, 2026
e36fa90

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
423e261

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
157417a

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
fa84d48

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 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


12 changes: 6 additions & 6 deletions
src/quic/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ data channels that carry application data.

Every entry point that may generate outbound data creates a
`SendPendingDataScope`. Scopes nest — an internal depth counter ensures
`Application::SendPendingData()` is called exactly once, when the outermost
`Session::SendPendingData()` is called exactly once, when the outermost
scope exits:

```cpp
Expand DownExpand Up@@ -218,13 +218,13 @@ Session::Receive()

```text
SendPendingDataScope::~SendPendingDataScope()
 → Application::SendPendingData()
 → Session::SendPendingData()
 Loop (up to max_packet_count):
 ├── GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 ├── application().GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 │ encrypts, frames, paces
 ├── if ndatalen > 0: StreamCommit()
 ├── if ndatalen > 0: application().StreamCommit()
 │ stream->Commit(datalen, fin)
 ├── if nwrite > 0: Send() // uv_udp_send()
 ├── if WRITE_MORE: continue // room for more in this packet
Expand Down

455 changes: 6 additions & 449 deletions
src/quic/application.cc

View file


Open in desktop


Large diffs are not rendered by default.


56 changes: 0 additions & 56 deletions
src/quic/application.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,10 +205,6 @@ class Session::Application : public MemoryRetainer {
 return false;
 }

 // Signals to the Application that it should serialize and transmit any
 // pending session and stream packets it has accumulated.
 void SendPendingData();

 // Returns true if the application protocol supports sending and
 // receiving headers on streams (e.g. HTTP/3). Applications that
 // do not support headers should return false (the default).
Expand DownExpand Up@@ -243,10 +239,6 @@ class Session::Application : public MemoryRetainer {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 // The StreamData struct is used by the application to pass pending stream
 // data to the session for transmission.
 struct StreamData;

 virtual int GetStreamData(StreamData* data) = 0;
 virtual bool StreamCommit(StreamData* data, size_t datalen) = 0;

Expand All@@ -262,57 +254,9 @@ class Session::Application : public MemoryRetainer {
 }

 private:
 Packet::Ptr CreateStreamDataPacket();

 // Tries to pack a pending datagram into the current packet buffer.
 // If < 0 is returned, either NGTCP2_ERR_WRITE_MORE or a fatal error is
 // returned; the caller must check. If > 0 is returned, the packet is done
 // and the value is the size of the finalized packet. If 0 is returned,
 // the datagram is either congestion limited or was abandoned
 ssize_t TryWritePendingDatagram(PathStorage* path,
 uint8_t* dest,
 size_t destlen,
 uint64_t ts);

 // Write the given stream_data into the buffer. The PacketInfo out-param
 // is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)
 // that should be applied when sending the packet.
 ssize_t WriteVStream(PathStorage* path,
 PacketInfo* pi,
 uint8_t* buf,
 ssize_t* ndatalen,
 size_t max_packet_size,
 const StreamData& stream_data,
 uint64_t ts);

 Session* session_ = nullptr;
};

struct Session::Application::StreamData final {
 // The actual number of vectors in the struct, up to kMaxVectorCount.
 size_t count = 0;
 // The stream identifier. If this is a negative value then no stream is
 // identified.
 stream_id id = -1;
 int fin = 0;
 ngtcp2_vec data[kMaxVectorCount]{};
 BaseObjectPtr<Stream> stream;

 static_assert(sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 inline operator nghttp3_vec*() {
 return reinterpret_cast<nghttp3_vec*>(data);
 }

 inline operator const ngtcp2_vec*() const { return data; }
 inline operator ngtcp2_vec*() { return data; }

 std::string ToString() const;
};

// Create a DefaultApplication for the given session.
std::unique_ptr<Session::Application> CreateDefaultApplication(
 Session* session, const Session::Application_Options& options);
Expand Down

86 changes: 40 additions & 46 deletions
src/quic/http3.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,24 +209,25 @@ class Http3ApplicationImpl final : public Session::Application {
 started_ = true;
 Debug(&session(), "Starting HTTP/3 application.");

 auto params = ngtcp2_conn_get_remote_transport_params(session());
 if (params == nullptr) [[unlikely]] {
const auto params = session().remote_transport_params();
 if (!params) [[unlikely]] {
 // The params are not available yet. Cannot start.
 Debug(&session(),
 "Cannot start HTTP/3 application yet. No remote transport params");
 return false;
 }

 if (params->initial_max_streams_uni < 3) {
 if (params.initial_max_streams_uni() < 3) {
 // HTTP3 requires 3 unidirectional control streams to be opened in each
 // direction in additional to the bidirectional streams that are used to
 // actually carry request and response payload back and forth.
 // See:
 // https://nghttp2.org/nghttp3/programmers-guide.html#binding-control-streams
 Debug(&session(),
 "Cannot start HTTP/3 application. Initial max "
 "unidirectional streams [%zu] is too low. Must be at least 3",
 params->initial_max_streams_uni);
 "unidirectional streams [%" PRIu64
 "] is too low. Must be at least 3",
 params.initial_max_streams_uni());
 return false;
 }

Expand All@@ -235,17 +236,14 @@ class Http3ApplicationImpl final : public Session::Application {
 // of requests that the client can actually created.
 if (session().is_server()) {
 nghttp3_conn_set_max_client_streams_bidi(
 *this, params->initial_max_streams_bidi);
 *this, params.initial_max_streams_bidi());
 }

 Debug(&session(), "Creating and binding HTTP/3 control streams");
 bool ret =
 ngtcp2_conn_open_uni_stream(session(), &control_stream_id_, nullptr) ==
 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_enc_stream_id_, nullptr) == 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_dec_stream_id_, nullptr) == 0 &&
 session().OpenUnidirectionalStream(&control_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_enc_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_dec_stream_id_) &&
 nghttp3_conn_bind_control_stream(*this, control_stream_id_) == 0 &&
 nghttp3_conn_bind_qpack_streams(
 *this, qpack_enc_stream_id_, qpack_dec_stream_id_) == 0;
Expand DownExpand Up@@ -306,8 +304,7 @@ class Http3ApplicationImpl final : public Session::Application {
 Debug(&session(),
 "Extending stream and connection offset by %zd bytes",
 nread);
 session().ExtendStreamOffset(id, nread);
 session().ExtendOffset(nread);
 session().Consume(id, nread);
 }

 // If this data arrived as 0-RTT, mark the stream. We set it after
Expand DownExpand Up@@ -365,24 +362,11 @@ class Http3ApplicationImpl final : public Session::Application {
 case EndpointLabel::LOCAL:
 return;
 case EndpointLabel::REMOTE: {
 switch (direction) {
 case Direction::BIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max bidi streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_bidi(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 case Direction::UNIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max uni streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_uni(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 }
 Debug(&session(),
 "HTTP/3 application extending max %s streams by %" PRIu64,
 direction == Direction::BIDIRECTIONAL ? "bidi" : "uni",
 max_streams);
 session().ExtendMaxStreams(direction, max_streams);
 }
 }
 }
Expand DownExpand Up@@ -530,8 +514,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand All@@ -548,8 +531,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand DownExpand Up@@ -687,17 +669,30 @@ class Http3ApplicationImpl final : public Session::Application {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 int GetStreamData(StreamData* data) override {
 int GetStreamData(Session::StreamData* data) override {
 static_assert(
 sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 data->count = kMaxVectorCount;
 ssize_t ret = 0;
 Debug(&session(), "HTTP/3 application getting stream data");
 if (conn_ && session().max_data_left()) {
 ret = nghttp3_conn_writev_stream(
 *this, &data->id, &data->fin, *data, data->count);
 // nghttp3 reports fin through an int out-param; bridge it to the bool.
 int fin = 0;
 ret =
 nghttp3_conn_writev_stream(*this,
 &data->id,
 &fin,
 reinterpret_cast<nghttp3_vec*>(data->data),
 data->count);
 // A negative return value indicates an error.
 if (ret < 0) {
 return static_cast<int>(ret);
 }
 data->fin = fin != 0;

 data->count = static_cast<size_t>(ret);
 if (data->id >= 0 && data->id != control_stream_id_ &&
Expand All@@ -710,7 +705,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return 0;
 }

 bool StreamCommit(StreamData* data, size_t datalen) override {
 bool StreamCommit(Session::StreamData* data, size_t datalen) override {
 Debug(&session(),
 "HTTP/3 application committing stream %" PRIi64 " data %zu",
 data->id,
Expand All@@ -720,8 +715,7 @@ class Http3ApplicationImpl final : public Session::Application {
 // nghttp3 tracks its own offset via add_write_offset.
 int err = nghttp3_conn_add_write_offset(*this, data->id, datalen);
 if (err != 0) {
 session().SetLastError(QuicError::ForApplication(
 nghttp3_err_infer_quic_app_error_code(err)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(err));
 return false;
 }
 // Raw application bytes are committed to the stream's outbound
Expand DownExpand Up@@ -1211,10 +1205,10 @@ class Http3ApplicationImpl final : public Session::Application {
 void* conn_user_data,
 void* stream_user_data) {
 NGHTTP3_CALLBACK_SCOPE(app);
auto& session = app.session();
Debug(&session, "HTTP/3 application deferred consume %zu bytes", consumed);
session.ExtendStreamOffset(id, consumed);
 session.ExtendOffset(consumed);
Debug(&app.session(),
"HTTP/3 application deferred consume %zu bytes",
 consumed);
app.session().Consume(id, consumed);
 return NGTCP2_SUCCESS;
 }

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
quic: extract transport logic from Application to Session#64127

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

 Merged

nodejs-github-bot
merged 5 commits into

from

Jul 8, 2026

+608

−562

 Merged


quic: extract transport logic from Application to Session
#64127
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
eef9fce

quic: extract transport logic from Application to Session


pimterry Jun 25, 2026
e36fa90

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
423e261

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
157417a

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
fa84d48

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 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


12 changes: 6 additions & 6 deletions
src/quic/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ data channels that carry application data.

Every entry point that may generate outbound data creates a
`SendPendingDataScope`. Scopes nest — an internal depth counter ensures
`Application::SendPendingData()` is called exactly once, when the outermost
`Session::SendPendingData()` is called exactly once, when the outermost
scope exits:

```cpp
Expand DownExpand Up@@ -218,13 +218,13 @@ Session::Receive()

```text
SendPendingDataScope::~SendPendingDataScope()
 → Application::SendPendingData()
 → Session::SendPendingData()
 Loop (up to max_packet_count):
 ├── GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 ├── application().GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 │ encrypts, frames, paces
 ├── if ndatalen > 0: StreamCommit()
 ├── if ndatalen > 0: application().StreamCommit()
 │ stream->Commit(datalen, fin)
 ├── if nwrite > 0: Send() // uv_udp_send()
 ├── if WRITE_MORE: continue // room for more in this packet
Expand Down

455 changes: 6 additions & 449 deletions
src/quic/application.cc

View file


Open in desktop


Large diffs are not rendered by default.


56 changes: 0 additions & 56 deletions
src/quic/application.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,10 +205,6 @@ class Session::Application : public MemoryRetainer {
 return false;
 }

 // Signals to the Application that it should serialize and transmit any
 // pending session and stream packets it has accumulated.
 void SendPendingData();

 // Returns true if the application protocol supports sending and
 // receiving headers on streams (e.g. HTTP/3). Applications that
 // do not support headers should return false (the default).
Expand DownExpand Up@@ -243,10 +239,6 @@ class Session::Application : public MemoryRetainer {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 // The StreamData struct is used by the application to pass pending stream
 // data to the session for transmission.
 struct StreamData;

 virtual int GetStreamData(StreamData* data) = 0;
 virtual bool StreamCommit(StreamData* data, size_t datalen) = 0;

Expand All@@ -262,57 +254,9 @@ class Session::Application : public MemoryRetainer {
 }

 private:
 Packet::Ptr CreateStreamDataPacket();

 // Tries to pack a pending datagram into the current packet buffer.
 // If < 0 is returned, either NGTCP2_ERR_WRITE_MORE or a fatal error is
 // returned; the caller must check. If > 0 is returned, the packet is done
 // and the value is the size of the finalized packet. If 0 is returned,
 // the datagram is either congestion limited or was abandoned
 ssize_t TryWritePendingDatagram(PathStorage* path,
 uint8_t* dest,
 size_t destlen,
 uint64_t ts);

 // Write the given stream_data into the buffer. The PacketInfo out-param
 // is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)
 // that should be applied when sending the packet.
 ssize_t WriteVStream(PathStorage* path,
 PacketInfo* pi,
 uint8_t* buf,
 ssize_t* ndatalen,
 size_t max_packet_size,
 const StreamData& stream_data,
 uint64_t ts);

 Session* session_ = nullptr;
};

struct Session::Application::StreamData final {
 // The actual number of vectors in the struct, up to kMaxVectorCount.
 size_t count = 0;
 // The stream identifier. If this is a negative value then no stream is
 // identified.
 stream_id id = -1;
 int fin = 0;
 ngtcp2_vec data[kMaxVectorCount]{};
 BaseObjectPtr<Stream> stream;

 static_assert(sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 inline operator nghttp3_vec*() {
 return reinterpret_cast<nghttp3_vec*>(data);
 }

 inline operator const ngtcp2_vec*() const { return data; }
 inline operator ngtcp2_vec*() { return data; }

 std::string ToString() const;
};

// Create a DefaultApplication for the given session.
std::unique_ptr<Session::Application> CreateDefaultApplication(
 Session* session, const Session::Application_Options& options);
Expand Down

86 changes: 40 additions & 46 deletions
src/quic/http3.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,24 +209,25 @@ class Http3ApplicationImpl final : public Session::Application {
 started_ = true;
 Debug(&session(), "Starting HTTP/3 application.");

 auto params = ngtcp2_conn_get_remote_transport_params(session());
 if (params == nullptr) [[unlikely]] {
const auto params = session().remote_transport_params();
 if (!params) [[unlikely]] {
 // The params are not available yet. Cannot start.
 Debug(&session(),
 "Cannot start HTTP/3 application yet. No remote transport params");
 return false;
 }

 if (params->initial_max_streams_uni < 3) {
 if (params.initial_max_streams_uni() < 3) {
 // HTTP3 requires 3 unidirectional control streams to be opened in each
 // direction in additional to the bidirectional streams that are used to
 // actually carry request and response payload back and forth.
 // See:
 // https://nghttp2.org/nghttp3/programmers-guide.html#binding-control-streams
 Debug(&session(),
 "Cannot start HTTP/3 application. Initial max "
 "unidirectional streams [%zu] is too low. Must be at least 3",
 params->initial_max_streams_uni);
 "unidirectional streams [%" PRIu64
 "] is too low. Must be at least 3",
 params.initial_max_streams_uni());
 return false;
 }

Expand All@@ -235,17 +236,14 @@ class Http3ApplicationImpl final : public Session::Application {
 // of requests that the client can actually created.
 if (session().is_server()) {
 nghttp3_conn_set_max_client_streams_bidi(
 *this, params->initial_max_streams_bidi);
 *this, params.initial_max_streams_bidi());
 }

 Debug(&session(), "Creating and binding HTTP/3 control streams");
 bool ret =
 ngtcp2_conn_open_uni_stream(session(), &control_stream_id_, nullptr) ==
 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_enc_stream_id_, nullptr) == 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_dec_stream_id_, nullptr) == 0 &&
 session().OpenUnidirectionalStream(&control_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_enc_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_dec_stream_id_) &&
 nghttp3_conn_bind_control_stream(*this, control_stream_id_) == 0 &&
 nghttp3_conn_bind_qpack_streams(
 *this, qpack_enc_stream_id_, qpack_dec_stream_id_) == 0;
Expand DownExpand Up@@ -306,8 +304,7 @@ class Http3ApplicationImpl final : public Session::Application {
 Debug(&session(),
 "Extending stream and connection offset by %zd bytes",
 nread);
 session().ExtendStreamOffset(id, nread);
 session().ExtendOffset(nread);
 session().Consume(id, nread);
 }

 // If this data arrived as 0-RTT, mark the stream. We set it after
Expand DownExpand Up@@ -365,24 +362,11 @@ class Http3ApplicationImpl final : public Session::Application {
 case EndpointLabel::LOCAL:
 return;
 case EndpointLabel::REMOTE: {
 switch (direction) {
 case Direction::BIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max bidi streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_bidi(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 case Direction::UNIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max uni streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_uni(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 }
 Debug(&session(),
 "HTTP/3 application extending max %s streams by %" PRIu64,
 direction == Direction::BIDIRECTIONAL ? "bidi" : "uni",
 max_streams);
 session().ExtendMaxStreams(direction, max_streams);
 }
 }
 }
Expand DownExpand Up@@ -530,8 +514,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand All@@ -548,8 +531,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand DownExpand Up@@ -687,17 +669,30 @@ class Http3ApplicationImpl final : public Session::Application {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 int GetStreamData(StreamData* data) override {
 int GetStreamData(Session::StreamData* data) override {
 static_assert(
 sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 data->count = kMaxVectorCount;
 ssize_t ret = 0;
 Debug(&session(), "HTTP/3 application getting stream data");
 if (conn_ && session().max_data_left()) {
 ret = nghttp3_conn_writev_stream(
 *this, &data->id, &data->fin, *data, data->count);
 // nghttp3 reports fin through an int out-param; bridge it to the bool.
 int fin = 0;
 ret =
 nghttp3_conn_writev_stream(*this,
 &data->id,
 &fin,
 reinterpret_cast<nghttp3_vec*>(data->data),
 data->count);
 // A negative return value indicates an error.
 if (ret < 0) {
 return static_cast<int>(ret);
 }
 data->fin = fin != 0;

 data->count = static_cast<size_t>(ret);
 if (data->id >= 0 && data->id != control_stream_id_ &&
Expand All@@ -710,7 +705,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return 0;
 }

 bool StreamCommit(StreamData* data, size_t datalen) override {
 bool StreamCommit(Session::StreamData* data, size_t datalen) override {
 Debug(&session(),
 "HTTP/3 application committing stream %" PRIi64 " data %zu",
 data->id,
Expand All@@ -720,8 +715,7 @@ class Http3ApplicationImpl final : public Session::Application {
 // nghttp3 tracks its own offset via add_write_offset.
 int err = nghttp3_conn_add_write_offset(*this, data->id, datalen);
 if (err != 0) {
 session().SetLastError(QuicError::ForApplication(
 nghttp3_err_infer_quic_app_error_code(err)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(err));
 return false;
 }
 // Raw application bytes are committed to the stream's outbound
Expand DownExpand Up@@ -1211,10 +1205,10 @@ class Http3ApplicationImpl final : public Session::Application {
 void* conn_user_data,
 void* stream_user_data) {
 NGHTTP3_CALLBACK_SCOPE(app);
auto& session = app.session();
Debug(&session, "HTTP/3 application deferred consume %zu bytes", consumed);
session.ExtendStreamOffset(id, consumed);
 session.ExtendOffset(consumed);
Debug(&app.session(),
"HTTP/3 application deferred consume %zu bytes",
 consumed);
app.session().Consume(id, consumed);
 return NGTCP2_SUCCESS;
 }

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
quic: extract transport logic from Application to Session#64127

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

 Merged

nodejs-github-bot
merged 5 commits into

from

Jul 8, 2026

+608

−562

 Merged


quic: extract transport logic from Application to Session
#64127
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
eef9fce

quic: extract transport logic from Application to Session


pimterry Jun 25, 2026
e36fa90

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
423e261

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
157417a

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
fa84d48

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 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


12 changes: 6 additions & 6 deletions
src/quic/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ data channels that carry application data.

Every entry point that may generate outbound data creates a
`SendPendingDataScope`. Scopes nest — an internal depth counter ensures
`Application::SendPendingData()` is called exactly once, when the outermost
`Session::SendPendingData()` is called exactly once, when the outermost
scope exits:

```cpp
Expand DownExpand Up@@ -218,13 +218,13 @@ Session::Receive()

```text
SendPendingDataScope::~SendPendingDataScope()
 → Application::SendPendingData()
 → Session::SendPendingData()
 Loop (up to max_packet_count):
 ├── GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 ├── application().GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 │ encrypts, frames, paces
 ├── if ndatalen > 0: StreamCommit()
 ├── if ndatalen > 0: application().StreamCommit()
 │ stream->Commit(datalen, fin)
 ├── if nwrite > 0: Send() // uv_udp_send()
 ├── if WRITE_MORE: continue // room for more in this packet
Expand Down

455 changes: 6 additions & 449 deletions
src/quic/application.cc

View file


Open in desktop


Large diffs are not rendered by default.


56 changes: 0 additions & 56 deletions
src/quic/application.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,10 +205,6 @@ class Session::Application : public MemoryRetainer {
 return false;
 }

 // Signals to the Application that it should serialize and transmit any
 // pending session and stream packets it has accumulated.
 void SendPendingData();

 // Returns true if the application protocol supports sending and
 // receiving headers on streams (e.g. HTTP/3). Applications that
 // do not support headers should return false (the default).
Expand DownExpand Up@@ -243,10 +239,6 @@ class Session::Application : public MemoryRetainer {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 // The StreamData struct is used by the application to pass pending stream
 // data to the session for transmission.
 struct StreamData;

 virtual int GetStreamData(StreamData* data) = 0;
 virtual bool StreamCommit(StreamData* data, size_t datalen) = 0;

Expand All@@ -262,57 +254,9 @@ class Session::Application : public MemoryRetainer {
 }

 private:
 Packet::Ptr CreateStreamDataPacket();

 // Tries to pack a pending datagram into the current packet buffer.
 // If < 0 is returned, either NGTCP2_ERR_WRITE_MORE or a fatal error is
 // returned; the caller must check. If > 0 is returned, the packet is done
 // and the value is the size of the finalized packet. If 0 is returned,
 // the datagram is either congestion limited or was abandoned
 ssize_t TryWritePendingDatagram(PathStorage* path,
 uint8_t* dest,
 size_t destlen,
 uint64_t ts);

 // Write the given stream_data into the buffer. The PacketInfo out-param
 // is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)
 // that should be applied when sending the packet.
 ssize_t WriteVStream(PathStorage* path,
 PacketInfo* pi,
 uint8_t* buf,
 ssize_t* ndatalen,
 size_t max_packet_size,
 const StreamData& stream_data,
 uint64_t ts);

 Session* session_ = nullptr;
};

struct Session::Application::StreamData final {
 // The actual number of vectors in the struct, up to kMaxVectorCount.
 size_t count = 0;
 // The stream identifier. If this is a negative value then no stream is
 // identified.
 stream_id id = -1;
 int fin = 0;
 ngtcp2_vec data[kMaxVectorCount]{};
 BaseObjectPtr<Stream> stream;

 static_assert(sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 inline operator nghttp3_vec*() {
 return reinterpret_cast<nghttp3_vec*>(data);
 }

 inline operator const ngtcp2_vec*() const { return data; }
 inline operator ngtcp2_vec*() { return data; }

 std::string ToString() const;
};

// Create a DefaultApplication for the given session.
std::unique_ptr<Session::Application> CreateDefaultApplication(
 Session* session, const Session::Application_Options& options);
Expand Down

86 changes: 40 additions & 46 deletions
src/quic/http3.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,24 +209,25 @@ class Http3ApplicationImpl final : public Session::Application {
 started_ = true;
 Debug(&session(), "Starting HTTP/3 application.");

 auto params = ngtcp2_conn_get_remote_transport_params(session());
 if (params == nullptr) [[unlikely]] {
const auto params = session().remote_transport_params();
 if (!params) [[unlikely]] {
 // The params are not available yet. Cannot start.
 Debug(&session(),
 "Cannot start HTTP/3 application yet. No remote transport params");
 return false;
 }

 if (params->initial_max_streams_uni < 3) {
 if (params.initial_max_streams_uni() < 3) {
 // HTTP3 requires 3 unidirectional control streams to be opened in each
 // direction in additional to the bidirectional streams that are used to
 // actually carry request and response payload back and forth.
 // See:
 // https://nghttp2.org/nghttp3/programmers-guide.html#binding-control-streams
 Debug(&session(),
 "Cannot start HTTP/3 application. Initial max "
 "unidirectional streams [%zu] is too low. Must be at least 3",
 params->initial_max_streams_uni);
 "unidirectional streams [%" PRIu64
 "] is too low. Must be at least 3",
 params.initial_max_streams_uni());
 return false;
 }

Expand All@@ -235,17 +236,14 @@ class Http3ApplicationImpl final : public Session::Application {
 // of requests that the client can actually created.
 if (session().is_server()) {
 nghttp3_conn_set_max_client_streams_bidi(
 *this, params->initial_max_streams_bidi);
 *this, params.initial_max_streams_bidi());
 }

 Debug(&session(), "Creating and binding HTTP/3 control streams");
 bool ret =
 ngtcp2_conn_open_uni_stream(session(), &control_stream_id_, nullptr) ==
 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_enc_stream_id_, nullptr) == 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_dec_stream_id_, nullptr) == 0 &&
 session().OpenUnidirectionalStream(&control_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_enc_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_dec_stream_id_) &&
 nghttp3_conn_bind_control_stream(*this, control_stream_id_) == 0 &&
 nghttp3_conn_bind_qpack_streams(
 *this, qpack_enc_stream_id_, qpack_dec_stream_id_) == 0;
Expand DownExpand Up@@ -306,8 +304,7 @@ class Http3ApplicationImpl final : public Session::Application {
 Debug(&session(),
 "Extending stream and connection offset by %zd bytes",
 nread);
 session().ExtendStreamOffset(id, nread);
 session().ExtendOffset(nread);
 session().Consume(id, nread);
 }

 // If this data arrived as 0-RTT, mark the stream. We set it after
Expand DownExpand Up@@ -365,24 +362,11 @@ class Http3ApplicationImpl final : public Session::Application {
 case EndpointLabel::LOCAL:
 return;
 case EndpointLabel::REMOTE: {
 switch (direction) {
 case Direction::BIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max bidi streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_bidi(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 case Direction::UNIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max uni streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_uni(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 }
 Debug(&session(),
 "HTTP/3 application extending max %s streams by %" PRIu64,
 direction == Direction::BIDIRECTIONAL ? "bidi" : "uni",
 max_streams);
 session().ExtendMaxStreams(direction, max_streams);
 }
 }
 }
Expand DownExpand Up@@ -530,8 +514,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand All@@ -548,8 +531,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand DownExpand Up@@ -687,17 +669,30 @@ class Http3ApplicationImpl final : public Session::Application {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 int GetStreamData(StreamData* data) override {
 int GetStreamData(Session::StreamData* data) override {
 static_assert(
 sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 data->count = kMaxVectorCount;
 ssize_t ret = 0;
 Debug(&session(), "HTTP/3 application getting stream data");
 if (conn_ && session().max_data_left()) {
 ret = nghttp3_conn_writev_stream(
 *this, &data->id, &data->fin, *data, data->count);
 // nghttp3 reports fin through an int out-param; bridge it to the bool.
 int fin = 0;
 ret =
 nghttp3_conn_writev_stream(*this,
 &data->id,
 &fin,
 reinterpret_cast<nghttp3_vec*>(data->data),
 data->count);
 // A negative return value indicates an error.
 if (ret < 0) {
 return static_cast<int>(ret);
 }
 data->fin = fin != 0;

 data->count = static_cast<size_t>(ret);
 if (data->id >= 0 && data->id != control_stream_id_ &&
Expand All@@ -710,7 +705,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return 0;
 }

 bool StreamCommit(StreamData* data, size_t datalen) override {
 bool StreamCommit(Session::StreamData* data, size_t datalen) override {
 Debug(&session(),
 "HTTP/3 application committing stream %" PRIi64 " data %zu",
 data->id,
Expand All@@ -720,8 +715,7 @@ class Http3ApplicationImpl final : public Session::Application {
 // nghttp3 tracks its own offset via add_write_offset.
 int err = nghttp3_conn_add_write_offset(*this, data->id, datalen);
 if (err != 0) {
 session().SetLastError(QuicError::ForApplication(
 nghttp3_err_infer_quic_app_error_code(err)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(err));
 return false;
 }
 // Raw application bytes are committed to the stream's outbound
Expand DownExpand Up@@ -1211,10 +1205,10 @@ class Http3ApplicationImpl final : public Session::Application {
 void* conn_user_data,
 void* stream_user_data) {
 NGHTTP3_CALLBACK_SCOPE(app);
auto& session = app.session();
Debug(&session, "HTTP/3 application deferred consume %zu bytes", consumed);
session.ExtendStreamOffset(id, consumed);
 session.ExtendOffset(consumed);
Debug(&app.session(),
"HTTP/3 application deferred consume %zu bytes",
 consumed);
app.session().Consume(id, consumed);
 return NGTCP2_SUCCESS;
 }

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
quic: extract transport logic from Application to Session#64127

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

 Merged

nodejs-github-bot
merged 5 commits into

from

Jul 8, 2026

+608

−562

 Merged


quic: extract transport logic from Application to Session
#64127
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
eef9fce

quic: extract transport logic from Application to Session


pimterry Jun 25, 2026
e36fa90

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
423e261

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
157417a

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 2026
fa84d48

fixup! quic: extract transport logic from Application to Session


pimterry Jul 7, 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


12 changes: 6 additions & 6 deletions
src/quic/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ data channels that carry application data.

Every entry point that may generate outbound data creates a
`SendPendingDataScope`. Scopes nest — an internal depth counter ensures
`Application::SendPendingData()` is called exactly once, when the outermost
`Session::SendPendingData()` is called exactly once, when the outermost
scope exits:

```cpp
Expand DownExpand Up@@ -218,13 +218,13 @@ Session::Receive()

```text
SendPendingDataScope::~SendPendingDataScope()
 → Application::SendPendingData()
 → Session::SendPendingData()
 Loop (up to max_packet_count):
 ├── GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 ├── application().GetStreamData() // pull data from next stream
 │ └── stream->Pull() // bob pull from Outbound→DataQueue
 ├── WriteVStream() // ngtcp2_conn_writev_stream()
 │ encrypts, frames, paces
 ├── if ndatalen > 0: StreamCommit()
 ├── if ndatalen > 0: application().StreamCommit()
 │ stream->Commit(datalen, fin)
 ├── if nwrite > 0: Send() // uv_udp_send()
 ├── if WRITE_MORE: continue // room for more in this packet
Expand Down

455 changes: 6 additions & 449 deletions
src/quic/application.cc

View file


Open in desktop


Large diffs are not rendered by default.


56 changes: 0 additions & 56 deletions
src/quic/application.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,10 +205,6 @@ class Session::Application : public MemoryRetainer {
 return false;
 }

 // Signals to the Application that it should serialize and transmit any
 // pending session and stream packets it has accumulated.
 void SendPendingData();

 // Returns true if the application protocol supports sending and
 // receiving headers on streams (e.g. HTTP/3). Applications that
 // do not support headers should return false (the default).
Expand DownExpand Up@@ -243,10 +239,6 @@ class Session::Application : public MemoryRetainer {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 // The StreamData struct is used by the application to pass pending stream
 // data to the session for transmission.
 struct StreamData;

 virtual int GetStreamData(StreamData* data) = 0;
 virtual bool StreamCommit(StreamData* data, size_t datalen) = 0;

Expand All@@ -262,57 +254,9 @@ class Session::Application : public MemoryRetainer {
 }

 private:
 Packet::Ptr CreateStreamDataPacket();

 // Tries to pack a pending datagram into the current packet buffer.
 // If < 0 is returned, either NGTCP2_ERR_WRITE_MORE or a fatal error is
 // returned; the caller must check. If > 0 is returned, the packet is done
 // and the value is the size of the finalized packet. If 0 is returned,
 // the datagram is either congestion limited or was abandoned
 ssize_t TryWritePendingDatagram(PathStorage* path,
 uint8_t* dest,
 size_t destlen,
 uint64_t ts);

 // Write the given stream_data into the buffer. The PacketInfo out-param
 // is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)
 // that should be applied when sending the packet.
 ssize_t WriteVStream(PathStorage* path,
 PacketInfo* pi,
 uint8_t* buf,
 ssize_t* ndatalen,
 size_t max_packet_size,
 const StreamData& stream_data,
 uint64_t ts);

 Session* session_ = nullptr;
};

struct Session::Application::StreamData final {
 // The actual number of vectors in the struct, up to kMaxVectorCount.
 size_t count = 0;
 // The stream identifier. If this is a negative value then no stream is
 // identified.
 stream_id id = -1;
 int fin = 0;
 ngtcp2_vec data[kMaxVectorCount]{};
 BaseObjectPtr<Stream> stream;

 static_assert(sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 inline operator nghttp3_vec*() {
 return reinterpret_cast<nghttp3_vec*>(data);
 }

 inline operator const ngtcp2_vec*() const { return data; }
 inline operator ngtcp2_vec*() { return data; }

 std::string ToString() const;
};

// Create a DefaultApplication for the given session.
std::unique_ptr<Session::Application> CreateDefaultApplication(
 Session* session, const Session::Application_Options& options);
Expand Down

86 changes: 40 additions & 46 deletions
src/quic/http3.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -209,24 +209,25 @@ class Http3ApplicationImpl final : public Session::Application {
 started_ = true;
 Debug(&session(), "Starting HTTP/3 application.");

 auto params = ngtcp2_conn_get_remote_transport_params(session());
 if (params == nullptr) [[unlikely]] {
const auto params = session().remote_transport_params();
 if (!params) [[unlikely]] {
 // The params are not available yet. Cannot start.
 Debug(&session(),
 "Cannot start HTTP/3 application yet. No remote transport params");
 return false;
 }

 if (params->initial_max_streams_uni < 3) {
 if (params.initial_max_streams_uni() < 3) {
 // HTTP3 requires 3 unidirectional control streams to be opened in each
 // direction in additional to the bidirectional streams that are used to
 // actually carry request and response payload back and forth.
 // See:
 // https://nghttp2.org/nghttp3/programmers-guide.html#binding-control-streams
 Debug(&session(),
 "Cannot start HTTP/3 application. Initial max "
 "unidirectional streams [%zu] is too low. Must be at least 3",
 params->initial_max_streams_uni);
 "unidirectional streams [%" PRIu64
 "] is too low. Must be at least 3",
 params.initial_max_streams_uni());
 return false;
 }

Expand All@@ -235,17 +236,14 @@ class Http3ApplicationImpl final : public Session::Application {
 // of requests that the client can actually created.
 if (session().is_server()) {
 nghttp3_conn_set_max_client_streams_bidi(
 *this, params->initial_max_streams_bidi);
 *this, params.initial_max_streams_bidi());
 }

 Debug(&session(), "Creating and binding HTTP/3 control streams");
 bool ret =
 ngtcp2_conn_open_uni_stream(session(), &control_stream_id_, nullptr) ==
 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_enc_stream_id_, nullptr) == 0 &&
 ngtcp2_conn_open_uni_stream(
 session(), &qpack_dec_stream_id_, nullptr) == 0 &&
 session().OpenUnidirectionalStream(&control_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_enc_stream_id_) &&
 session().OpenUnidirectionalStream(&qpack_dec_stream_id_) &&
 nghttp3_conn_bind_control_stream(*this, control_stream_id_) == 0 &&
 nghttp3_conn_bind_qpack_streams(
 *this, qpack_enc_stream_id_, qpack_dec_stream_id_) == 0;
Expand DownExpand Up@@ -306,8 +304,7 @@ class Http3ApplicationImpl final : public Session::Application {
 Debug(&session(),
 "Extending stream and connection offset by %zd bytes",
 nread);
 session().ExtendStreamOffset(id, nread);
 session().ExtendOffset(nread);
 session().Consume(id, nread);
 }

 // If this data arrived as 0-RTT, mark the stream. We set it after
Expand DownExpand Up@@ -365,24 +362,11 @@ class Http3ApplicationImpl final : public Session::Application {
 case EndpointLabel::LOCAL:
 return;
 case EndpointLabel::REMOTE: {
 switch (direction) {
 case Direction::BIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max bidi streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_bidi(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 case Direction::UNIDIRECTIONAL: {
 Debug(&session(),
 "HTTP/3 application extending max uni streams by %" PRIu64,
 max_streams);
 ngtcp2_conn_extend_max_streams_uni(
 session(), static_cast<size_t>(max_streams));
 break;
 }
 }
 Debug(&session(),
 "HTTP/3 application extending max %s streams by %" PRIu64,
 direction == Direction::BIDIRECTIONAL ? "bidi" : "uni",
 max_streams);
 session().ExtendMaxStreams(direction, max_streams);
 }
 }
 }
Expand DownExpand Up@@ -530,8 +514,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand All@@ -548,8 +531,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return;
 }

 session().SetLastError(
 QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));
 session().Close();
 }

Expand DownExpand Up@@ -687,17 +669,30 @@ class Http3ApplicationImpl final : public Session::Application {
 return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};
 }

 int GetStreamData(StreamData* data) override {
 int GetStreamData(Session::StreamData* data) override {
 static_assert(
 sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&
 alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&
 offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&
 offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),
 "ngtcp2_vec and nghttp3_vec must have identical layout");
 data->count = kMaxVectorCount;
 ssize_t ret = 0;
 Debug(&session(), "HTTP/3 application getting stream data");
 if (conn_ && session().max_data_left()) {
 ret = nghttp3_conn_writev_stream(
 *this, &data->id, &data->fin, *data, data->count);
 // nghttp3 reports fin through an int out-param; bridge it to the bool.
 int fin = 0;
 ret =
 nghttp3_conn_writev_stream(*this,
 &data->id,
 &fin,
 reinterpret_cast<nghttp3_vec*>(data->data),
 data->count);
 // A negative return value indicates an error.
 if (ret < 0) {
 return static_cast<int>(ret);
 }
 data->fin = fin != 0;

 data->count = static_cast<size_t>(ret);
 if (data->id >= 0 && data->id != control_stream_id_ &&
Expand All@@ -710,7 +705,7 @@ class Http3ApplicationImpl final : public Session::Application {
 return 0;
 }

 bool StreamCommit(StreamData* data, size_t datalen) override {
 bool StreamCommit(Session::StreamData* data, size_t datalen) override {
 Debug(&session(),
 "HTTP/3 application committing stream %" PRIi64 " data %zu",
 data->id,
Expand All@@ -720,8 +715,7 @@ class Http3ApplicationImpl final : public Session::Application {
 // nghttp3 tracks its own offset via add_write_offset.
 int err = nghttp3_conn_add_write_offset(*this, data->id, datalen);
 if (err != 0) {
 session().SetLastError(QuicError::ForApplication(
 nghttp3_err_infer_quic_app_error_code(err)));
 session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(err));
 return false;
 }
 // Raw application bytes are committed to the stream's outbound
Expand DownExpand Up@@ -1211,10 +1205,10 @@ class Http3ApplicationImpl final : public Session::Application {
 void* conn_user_data,
 void* stream_user_data) {
 NGHTTP3_CALLBACK_SCOPE(app);
auto& session = app.session();
Debug(&session, "HTTP/3 application deferred consume %zu bytes", consumed);
session.ExtendStreamOffset(id, consumed);
 session.ExtendOffset(consumed);
Debug(&app.session(),
"HTTP/3 application deferred consume %zu bytes",
 consumed);
app.session().Consume(id, consumed);
 return NGTCP2_SUCCESS;
 }

Expand Down
Loading
Loading