Skip to content

Commit b4df8d3

Browse files
RaisinTentargos
authored andcommitted
http2: add diagnostics channel 'http2.server.stream.start'
Signed-off-by: Darshan Sen <raisinten@gmail.com> PR-URL: #58449 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
1 parent bef67e4 commit b4df8d3

4 files changed

Lines changed: 149 additions & 1 deletion

File tree

‎doc/api/diagnostics_channel.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,6 +1246,13 @@ closing the stream can be retrieved using the `stream.rstCode` property.
12461246

12471247
Emitted when a stream is created on the server.
12481248

1249+
`http2.server.stream.start`
1250+
1251+
*`stream` {ServerHttp2Stream}
1252+
*`headers` {HTTP/2 Headers Object}
1253+
1254+
Emitted when a stream is started on the server.
1255+
12491256
#### Modules
12501257

12511258
> Stability: 1 - Experimental

‎lib/internal/http2/core.js‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ const onClientStreamErrorChannel = dc.channel('http2.client.stream.error');
191191
constonClientStreamFinishChannel=dc.channel('http2.client.stream.finish');
192192
constonClientStreamCloseChannel=dc.channel('http2.client.stream.close');
193193
constonServerStreamCreatedChannel=dc.channel('http2.server.stream.created');
194+
constonServerStreamStartChannel=dc.channel('http2.server.stream.start');
194195

195196
letdebug=require('internal/util/debuglog').debuglog('http2',(fn)=>{
196197
debug=fn;
@@ -373,6 +374,12 @@ function onSessionHeaders(handle, id, cat, flags, headers, sensitiveHeaders) {
373374
headers: obj,
374375
});
375376
}
377+
if(onServerStreamStartChannel.hasSubscribers){
378+
onServerStreamStartChannel.publish({
379+
stream,
380+
headers: obj,
381+
});
382+
}
376383
if(endOfStream){
377384
stream.push(null);
378385
}
@@ -2838,7 +2845,16 @@ class ServerHttp2Stream extends Http2Stream {
28382845
if(headRequest)
28392846
stream[kState].flags|=STREAM_FLAGS_HEAD_REQUEST;
28402847

2841-
process.nextTick(callback,null,stream,headers,0);
2848+
process.nextTick(()=>{
2849+
if(onServerStreamStartChannel.hasSubscribers){
2850+
onServerStreamStartChannel.publish({
2851+
stream,
2852+
headers,
2853+
});
2854+
}
2855+
2856+
callback(null,stream,headers,0);
2857+
});
28422858

28432859
if(onServerStreamCreatedChannel.hasSubscribers){
28442860
onServerStreamCreatedChannel.publish({
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
if(!common.hasCrypto)
5+
common.skip('missing crypto');
6+
7+
// This test ensures that the built-in HTTP/2 diagnostics channels are reporting
8+
// the diagnostics messages for the 'http2.server.stream.start' channel only
9+
// after the 'http2.server.stream.created' channel.
10+
11+
constCountdown=require('../common/countdown');
12+
constassert=require('assert');
13+
constdc=require('diagnostics_channel');
14+
consthttp2=require('http2');
15+
16+
constserverHttp2StreamCreationCount=2;
17+
18+
constmap={};
19+
20+
dc.subscribe('http2.server.stream.created',common.mustCall(({ stream, headers })=>{
21+
map[stream.id]={ ...map[stream.id],'createdTime': process.hrtime.bigint()};
22+
},serverHttp2StreamCreationCount));
23+
24+
dc.subscribe('http2.server.stream.start',common.mustCall(({ stream, headers })=>{
25+
map[stream.id]={ ...map[stream.id],'startTime': process.hrtime.bigint()};
26+
},serverHttp2StreamCreationCount));
27+
28+
constserver=http2.createServer();
29+
server.on('stream',common.mustCall((stream)=>{
30+
stream.respond();
31+
stream.end();
32+
33+
stream.pushStream({},common.mustSucceed((pushStream)=>{
34+
pushStream.respond();
35+
pushStream.end();
36+
}));
37+
}));
38+
39+
server.listen(0,common.mustCall(()=>{
40+
constport=server.address().port;
41+
constclient=http2.connect(`http://localhost:${port}`);
42+
43+
constcountdown=newCountdown(serverHttp2StreamCreationCount,()=>{
44+
client.close();
45+
server.close();
46+
47+
consttimings=Object.values(map);
48+
assert.strictEqual(timings.length,serverHttp2StreamCreationCount);
49+
50+
for(const{ createdTime, startTime }oftimings){
51+
assert.ok(createdTime<startTime);
52+
}
53+
});
54+
55+
conststream=client.request({});
56+
stream.on('response',common.mustCall(()=>{
57+
countdown.dec();
58+
}));
59+
60+
client.on('stream',common.mustCall((pushStream)=>{
61+
pushStream.on('push',common.mustCall(()=>{
62+
countdown.dec();
63+
}));
64+
}));
65+
}));
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
if(!common.hasCrypto)
5+
common.skip('missing crypto');
6+
7+
// This test ensures that the built-in HTTP/2 diagnostics channels are reporting
8+
// the diagnostics messages for the 'http2.server.stream.start' channel when
9+
// ServerHttp2Streams are started by both:
10+
// - in response to an incoming 'stream' event from the client
11+
// - the server calling ServerHttp2Stream#pushStream()
12+
13+
constCountdown=require('../common/countdown');
14+
constassert=require('assert');
15+
constdc=require('diagnostics_channel');
16+
consthttp2=require('http2');
17+
const{ Duplex }=require('stream');
18+
19+
constserverHttp2StreamCreationCount=2;
20+
21+
dc.subscribe('http2.server.stream.start',common.mustCall(({ stream, headers })=>{
22+
// Since ServerHttp2Stream is not exported from any module, this just checks
23+
// if the stream is an instance of Duplex and the constructor name is
24+
// 'ServerHttp2Stream'.
25+
assert.ok(streaminstanceofDuplex);
26+
assert.strictEqual(stream.constructor.name,'ServerHttp2Stream');
27+
assert.ok(headers&&!Array.isArray(headers)&&typeofheaders==='object');
28+
},serverHttp2StreamCreationCount));
29+
30+
constserver=http2.createServer();
31+
server.on('stream',common.mustCall((stream)=>{
32+
stream.respond();
33+
stream.end();
34+
35+
stream.pushStream({},common.mustSucceed((pushStream)=>{
36+
pushStream.respond();
37+
pushStream.end();
38+
}));
39+
}));
40+
41+
server.listen(0,common.mustCall(()=>{
42+
constport=server.address().port;
43+
constclient=http2.connect(`http://localhost:${port}`);
44+
45+
constcountdown=newCountdown(serverHttp2StreamCreationCount,()=>{
46+
client.close();
47+
server.close();
48+
});
49+
50+
conststream=client.request({});
51+
stream.on('response',common.mustCall(()=>{
52+
countdown.dec();
53+
}));
54+
55+
client.on('stream',common.mustCall((pushStream)=>{
56+
pushStream.on('push',common.mustCall(()=>{
57+
countdown.dec();
58+
}));
59+
}));
60+
}));

0 commit comments

Comments
 (0)