http2: delay session.receive() by a tick

PR-URL: #35985 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Author: szmarczak

lib/internal/http2/core.js

@@ -3139,16 +3139,21 @@ function connect(authority, options, listener){
 if(typeoflistener==='function')
 session.once('connect',listener);
 
-debug('Http2Session connect',options.createConnection);
-// Socket already has some buffered data - emulate receiving it
-// https://github.com/nodejs/node/issues/35475
-if(socket&&socket.readableLength){
-letbuf;
-while((buf=socket.read())!==null){
-debug(`Http2Session connect: injecting ${buf.length} already in buffer`);
-session[kHandle].receive(buf);
+// Process data on the next tick - a remoteSettings handler may be attached.
+// https://github.com/nodejs/node/issues/35981
+process.nextTick(()=>{
+debug('Http2Session connect',options.createConnection);
+// Socket already has some buffered data - emulate receiving it
+// https://github.com/nodejs/node/issues/35475
+if(socket&&socket.readableLength){
+letbuf;
+while((buf=socket.read())!==null){
+debug(`Http2Session connect: ${buf.length} bytes already in buffer`);
+session[kHandle].receive(buf);
+}
 }
-}
+});
+
 returnsession;
 }
 

test/parallel/test-http2-connect-tls-with-delay.js

@@ -4,61 +4,47 @@ const common = require('../common');
 if(!common.hasCrypto)
 common.skip('missing crypto');
 
-if(!common.hasMultiLocalhost())
-common.skip('platform-specific test.');
-
 consthttp2=require('http2');
-constassert=require('assert');
 consttls=require('tls');
 constfixtures=require('../common/fixtures');
 
 constserverOptions={
 key: fixtures.readKey('agent1-key.pem'),
 cert: fixtures.readKey('agent1-cert.pem')
 };
-constserver=http2.createSecureServer(serverOptions,(req,res)=>{
-console.log(`Connect from: ${req.connection.remoteAddress}`);
-assert.strictEqual(req.connection.remoteAddress,'127.0.0.2');
 
-req.on('end',common.mustCall(()=>{
-res.writeHead(200,{'Content-Type': 'text/plain'});
-res.end(`You are from: ${req.connection.remoteAddress}`);
-}));
-req.resume();
+constserver=http2.createSecureServer(serverOptions,(req,res)=>{
+res.end();
 });
 
 server.listen(0,'127.0.0.1',common.mustCall(()=>{
 constoptions={
 ALPNProtocols: ['h2'],
 host: '127.0.0.1',
 servername: 'localhost',
-localAddress: '127.0.0.2',
 port: server.address().port,
 rejectUnauthorized: false
 };
 
-console.log('Server ready',server.address().port);
-
 constsocket=tls.connect(options,async()=>{
-
-console.log('TLS Connected!');
-
-setTimeout(()=>{
-
+socket.once('readable',()=>{
 constclient=http2.connect(
 'https://localhost:'+server.address().port,
 { ...options,createConnection: ()=>socket}
 );
-constreq=client.request({
-':path': '/'
-});
-req.on('data',()=>req.resume());
-req.on('end',common.mustCall(function(){
-client.close();
-req.close();
-server.close();
+
+client.once('remoteSettings',common.mustCall(()=>{
+constreq=client.request({
+':path': '/'
+});
+req.on('data',()=>req.resume());
+req.on('end',common.mustCall(()=>{
+client.close();
+req.close();
+server.close();
+}));
+req.end();
 }));
-req.end();
-},1000);
+});
 });
 }));