Skip to content

Commit dce01fd

Browse files
mmomtchevBethGriggs
authored andcommittedDec 15, 2020
http2: move events to the JSStreamSocket
When using a JSStreamSocket, the HTTP2Session constructor will replace the socket object http2 events should be attached to the JSStreamSocket object because the http2 session handle lives there Fixes: #35695 PR-URL: #35772 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ricky Zhou <0x19951125@gmail.com>
1 parent 1ca1f26 commit dce01fd

File tree

2 files changed

+61
-3
lines changed

2 files changed

+61
-3
lines changed
 

‎lib/internal/http2/core.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -3098,11 +3098,14 @@ function connect(authority, options, listener) {
30983098
}
30993099
}
31003100

3101-
socket.on('error', socketOnError);
3102-
socket.on('close', socketOnClose);
3103-
31043101
const session = new ClientHttp2Session(options, socket);
31053102

3103+
// ClientHttp2Session may create a new socket object
3104+
// when socket is a JSSocket (socket != kSocket)
3105+
// https://github.com/nodejs/node/issues/35695
3106+
session[kSocket].on('error', socketOnError);
3107+
session[kSocket].on('close', socketOnClose);
3108+
31063109
session[kAuthority] = `${options.servername || host}:${port}`;
31073110
session[kProtocol] = protocol;
31083111

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
'use strict';
2+
3+
const common = require('../common');
4+
if (!common.hasCrypto)
5+
common.skip('missing crypto');
6+
const h2 = require('http2');
7+
const tls = require('tls');
8+
const fixtures = require('../common/fixtures');
9+
const { Duplex } = require('stream');
10+
11+
const server = h2.createSecureServer({
12+
key: fixtures.readKey('agent1-key.pem'),
13+
cert: fixtures.readKey('agent1-cert.pem')
14+
});
15+
16+
class JSSocket extends Duplex {
17+
constructor(socket) {
18+
super({ emitClose: true });
19+
socket.on('close', () => this.destroy());
20+
socket.on('data', (data) => this.push(data));
21+
this.socket = socket;
22+
}
23+
24+
_write(data, encoding, callback) {
25+
this.socket.write(data, encoding, callback);
26+
}
27+
28+
_read(size) {
29+
}
30+
31+
_final(cb) {
32+
cb();
33+
}
34+
}
35+
36+
server.listen(0, common.mustCall(function() {
37+
const socket = tls.connect({
38+
rejectUnauthorized: false,
39+
host: 'localhost',
40+
port: this.address().port,
41+
ALPNProtocols: ['h2']
42+
}, () => {
43+
const proxy = new JSSocket(socket);
44+
const client = h2.connect(`https://localhost:${this.address().port}`, {
45+
createConnection: () => proxy
46+
});
47+
const req = client.request();
48+
49+
setTimeout(() => socket.destroy(), 200);
50+
setTimeout(() => client.close(), 400);
51+
setTimeout(() => server.close(), 600);
52+
53+
req.on('close', common.mustCall(() => { }));
54+
});
55+
}));

0 commit comments

Comments
 (0)
Please sign in to comment.