archive/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-08-16 06:08:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

http2: cleanup Http2Stream/Http2Session destroy

Browse source 
PR-URL: https://github.com/nodejs/node/pull/17406
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>

This is a significant cleanup and refactoring of the
cleanup/close/destroy logic for Http2Stream and Http2Session.
There are significant changes here in the timing and ordering
of cleanup logic, JS apis. and various related necessary edits.
This commit is contained in:
James M Snell 2017-12-12 11:34:17 -08:00
parent 18ca0b6442
commit 0babd181a0
146 changed files with 2637 additions and 2691 deletions
Download patch file Download diff file Expand all files Collapse all files

41
test/parallel/test-http2-server-push-stream-errors.js
View file

@ -34,9 +34,8 @@ const specificTests = [
{
ngError: constants.NGHTTP2_ERR_STREAM_CLOSED,
error: {
code: 'ERR_HTTP2_STREAM_CLOSED',
type: Error,
message: 'The stream is already closed'
code: 'ERR_HTTP2_INVALID_STREAM',
type: Error
},
type: 'stream'
},
@ -66,47 +65,25 @@ Http2Stream.prototype.pushPromise = () => currentError.ngError;
const server = http2.createServer();
server.on('stream', common.mustCall((stream, headers) => {
const errorMustCall = common.expectsError(currentError.error);
const errorMustNotCall = common.mustNotCall(
`${currentError.error.code} should emit on ${currentError.type}`
);
if (currentError.type === 'stream') {
stream.session.on('error', errorMustNotCall);
stream.on('error', errorMustCall);
stream.on('error', common.mustCall(() => {
stream.respond();
stream.end();
}));
} else {
stream.session.once('error', errorMustCall);
stream.on('error', errorMustNotCall);
}
stream.pushStream({}, () => {});
stream.pushStream({}, common.expectsError(currentError.error));
stream.respond();
stream.end();
}, tests.length));
server.listen(0, common.mustCall(() => runTest(tests.shift())));
function runTest(test) {
const port = server.address().port;
const url = `http://localhost:${port}`;
const headers = {
':path': '/',
':method': 'POST',
':scheme': 'http',
':authority': `localhost:${port}`
};
const url = `http://localhost:${server.address().port}`;
const client = http2.connect(url);
const req = client.request(headers);
const req = client.request();
currentError = test;
req.resume();
req.end();
req.on('end', common.mustCall(() => {
client.destroy();
req.on('close', common.mustCall(() => {
client.close();
if (!tests.length) {
server.close();