Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions doc/api/quic.md
Original file line number Diff line number Diff line change
Expand Up @@ -3825,8 +3825,9 @@ A few things to note:
the request is `HEADERS` followed by `END_STREAM`.
* The `onheaders` callback receives the response pseudo-headers and
regular headers in a single object with lowercase string keys.
After the callback returns, the same object is also accessible
via [`stream.headers`][].
For incoming headers, the `:status` pseudo-header is converted to
a `number`, matching HTTP/2 behavior. After the callback returns,
the same object is also accessible via [`stream.headers`][].
* Reading `for await (const chunks of stream)` consumes the response
body. Each iteration yields a `Uint8Array[]` batch of chunks.
* HTTP semantic helpers (URL parsing, method/status validation,
Expand Down
15 changes: 10 additions & 5 deletions lib/internal/quic/quic.js
Original file line number Diff line number Diff line change
Expand Up @@ -1203,14 +1203,19 @@ function parseHeaderPairs(pairs) {
assert(pairs.length % 2 === 0);
const block = { __proto__: null };
for (let n = 0; n + 1 < pairs.length; n += 2) {
if (block[pairs[n]] !== undefined) {
if (ArrayIsArray(block[pairs[n]])) {
ArrayPrototypePush(block[pairs[n]], pairs[n + 1]);
const name = pairs[n];
let value = pairs[n + 1];
// Match HTTP/2 behavior: incoming :status is exposed as a number.
if (name === ':status')
value |= 0;
if (block[name] !== undefined) {
if (ArrayIsArray(block[name])) {
ArrayPrototypePush(block[name], value);
} else {
block[pairs[n]] = [block[pairs[n]], pairs[n + 1]];
block[name] = [block[name], value];
}
} else {
block[pairs[n]] = pairs[n + 1];
block[name] = value;
}
}
return block;
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-quic-h3-callback-errors.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ async function makeServer(onheadersHandler, extraOpts = {}) {
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
ontrailers: mustCall(function() {
throw new Error('ontrailers sync error');
Expand Down Expand Up @@ -268,7 +268,7 @@ async function makeServer(onheadersHandler, extraOpts = {}) {
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-quic-h3-close-behavior.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall((headers) => {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand All @@ -77,7 +77,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall((headers) => {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-quic-h3-concurrent-requests.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const requests = paths.map(mustCall(async (path) => {
':authority': 'localhost',
},
onheaders: mustCall((headers) => {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
headersReceived.resolve();
}),
});
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-quic-h3-datagram.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down Expand Up @@ -154,7 +154,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall((headers) => {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-quic-h3-error-codes.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down Expand Up @@ -109,7 +109,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-quic-h3-goaway.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ dc.subscribe('quic.session.goaway', mustCall((msg) => {
await clientSession.opened;

const onClientHeaders = mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
if (++clientHeaderCount === 2) {
bothHeadersReceived.resolve();
}
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-quic-h3-header-validation.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const decoder = new TextDecoder();
},
onheaders: mustCall(function(headers) {
// Client should also receive lowercased response header names.
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
strictEqual(headers['content-type'], 'text/html');
strictEqual(headers['x-response-header'], 'ResponseValue');

Expand Down Expand Up @@ -151,7 +151,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall((headers) => {
strictEqual(headers[':status'], '204');
strictEqual(headers[':status'], 204);
}),
});

Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-quic-h3-informational-headers.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dc.subscribe('quic.stream.info', mustCall((msg) => {
ok(msg.stream, 'stream.info should include stream');
ok(msg.session, 'stream.info should include session');
ok(msg.headers, 'stream.info should include headers');
strictEqual(msg.headers[':status'], '103');
strictEqual(msg.headers[':status'], 103);
}));

// quic.stream.headers also fires for the final response headers.
Expand Down Expand Up @@ -92,12 +92,12 @@ const stream = await clientSession.createBidirectionalStream({
':authority': 'localhost',
},
oninfo: mustCall(function(headers) {
strictEqual(headers[':status'], '103');
strictEqual(headers[':status'], 103);
strictEqual(headers.link, '</style.css>; rel=preload; as=style');
clientInfoReceived.resolve();
}),
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
strictEqual(headers['content-type'], 'text/plain');
clientHeadersReceived.resolve();
}),
Expand All @@ -110,7 +110,7 @@ const body = await bytes(stream);
strictEqual(decoder.decode(body), responseBody);

// stream.headers should return the final (initial) headers, not 1xx.
strictEqual(stream.headers[':status'], '200');
strictEqual(stream.headers[':status'], 200);

await Promise.all([stream.closed, serverDone.promise]);
await clientSession.close();
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-quic-h3-origin.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const decoder = new TextDecoder();
':authority': 'example.com',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down Expand Up @@ -176,7 +176,7 @@ const decoder = new TextDecoder();
':authority': 'custom-port.example.com',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-quic-h3-pending-stream.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const decoder = new TextDecoder();
priority: 'high',
incremental: true,
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-quic-h3-post-filehandle.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ writeFileSync(testFile, testContent);
},
body: fh,
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
clientHeadersReceived.resolve();
}),
});
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-quic-h3-post-request.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const stream = await clientSession.createBidirectionalStream({
},
body: encoder.encode(requestBody),
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
clientHeadersReceived.resolve();
}),
});
Expand Down
10 changes: 5 additions & 5 deletions test/parallel/test-quic-h3-priority.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const decoder = new TextDecoder();
priority: 'high',
incremental: false,
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand All @@ -88,7 +88,7 @@ const decoder = new TextDecoder();
priority: 'low',
incremental: true,
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});
deepStrictEqual(stream2.priority, { level: 'low', incremental: true });
Expand All @@ -102,7 +102,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});
deepStrictEqual(stream3.priority, { level: 'default', incremental: false });
Expand All @@ -116,7 +116,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});
// Default priority initially.
Expand Down Expand Up @@ -218,7 +218,7 @@ const decoder = new TextDecoder();
},
body: encoder.encode('signal'),
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});
deepStrictEqual(stream.priority, { level: 'default', incremental: false });
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-quic-h3-qpack-settings.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ async function makeRequest(clientSession, path) {
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});
const body = await bytes(stream);
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-quic-h3-request-response.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const stream = await clientSession.createBidirectionalStream({
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
strictEqual(headers['content-type'], 'text/plain');
clientHeadersReceived.resolve();
}),
Expand All @@ -109,7 +109,7 @@ const body = await bytes(stream);
strictEqual(decoder.decode(body), responseBody);

// stream.headers should return the buffered response headers.
strictEqual(stream.headers[':status'], '200');
strictEqual(stream.headers[':status'], 200);

await Promise.all([stream.closed, serverDone.promise]);
await clientSession.close();
Expand Down
6 changes: 3 additions & 3 deletions test/parallel/test-quic-h3-settings.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const decoder = new TextDecoder();
'x-second': 'two',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down Expand Up @@ -132,7 +132,7 @@ const decoder = new TextDecoder();
'x-long': longValue,
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down Expand Up @@ -179,7 +179,7 @@ const decoder = new TextDecoder();
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(headers[':status'], '200');
strictEqual(headers[':status'], 200);
}),
});

Expand Down
67 changes: 67 additions & 0 deletions test/parallel/test-quic-h3-status-code-type.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// Flags: --experimental-quic --experimental-stream-iter --no-warnings

// Verify incoming :status is exposed as a number, matching HTTP/2 behavior.
// See https://github.com/nodejs/node/issues/63557

import { hasQuic, skip, mustCall } from '../common/index.mjs';
import assert from 'node:assert';
import * as fixtures from '../common/fixtures.mjs';

const { strictEqual } = assert;
const { readKey } = fixtures;

if (!hasQuic) {
skip('QUIC is not enabled');
}

const { listen, connect } = await import('node:quic');
const { createPrivateKey } = await import('node:crypto');

const key = createPrivateKey(readKey('agent1-key.pem'));
const cert = readKey('agent1-cert.pem');

const codes = [200, 204, 404];
let serverResponses = 0;
const serverDone = Promise.withResolvers();

const serverEndpoint = await listen(mustCall(async (ss) => {
ss.onstream = mustCall(() => {
if (++serverResponses === codes.length) {
ss.close();
serverDone.resolve();
}
}, codes.length);
}), {
sni: { '*': { keys: [key], certs: [cert] } },
onheaders: mustCall(function() {
const status = codes[serverResponses - 1];
this.sendHeaders({ ':status': String(status) }, { terminal: true });
this.writer.endSync();
}, codes.length),
});

const clientSession = await connect(serverEndpoint.address, {
servername: 'localhost',
verifyPeer: 'manual',
});
await clientSession.opened;

for (const expected of codes) {
const stream = await clientSession.createBidirectionalStream({
headers: {
':method': 'GET',
':path': '/',
':scheme': 'https',
':authority': 'localhost',
},
onheaders: mustCall(function(headers) {
strictEqual(typeof headers[':status'], 'number');
strictEqual(headers[':status'], expected);
}),
});
await stream.closed;
}

await serverDone.promise;
await clientSession.close();
await serverEndpoint.close();
Loading
Loading