Add tests for trailers & chunk extensions too

Author: pimterry

test/parallel/test-http-upgrade-server-with-body-and-extras.mjs

@@ -0,0 +1,89 @@
+import * as common from '../common/index.mjs';
+import * as assert from 'assert';
+import * as http from 'http';
+import * as net from 'net';
+
+const EXPECTED_BODY_LENGTH = 12;
+
+const upgradeReceivedResolvers = Promise.withResolvers();
+
+const server = http.createServer();
+server.on('request', common.mustNotCall());
+server.on('upgrade', function(req, socket, upgradeHead) {
+  upgradeReceivedResolvers.resolve();
+
+  // Confirm the upgrade:
+  socket.write('HTTP/1.1 101 Switching Protocols\r\n' +
+              'Upgrade: custom-protocol\r\n' +
+              'Connection: Upgrade\r\n' +
+              '\r\n');
+
+  // Read and validate the request body:
+  let reqBodyLength = 0;
+  req.on('data', (chunk) => { reqBodyLength += chunk.length; });
+  req.on('end', common.mustCall(() => {
+    assert.strictEqual(reqBodyLength, EXPECTED_BODY_LENGTH);
+
+    assert.deepStrictEqual(req.trailers, { 'extra-data': 'abc' });
+
+    // Defer upgrade stream read slightly to make sure it doesn't start
+    // streaming along with the request body, until we actually read it:
+    setTimeout(common.mustCall(() => {
+      let socketData = upgradeHead;
+
+      socket.on('data', (d) => {
+        socketData = Buffer.concat([socketData, d]);
+      });
+
+      socket.on('end', common.mustCall(() => {
+        assert.strictEqual(socketData.toString(), 'upgrade head\npost-upgrade message');
+        socket.end();
+      }));
+    }), 10);
+  }));
+});
+
+await new Promise((resolve) => server.listen(0, () => resolve()));
+
+const conn = net.createConnection(server.address().port);
+conn.setEncoding('utf8');
+
+await new Promise((resolve) => conn.on('connect', resolve));
+
+// Write request headers, body & upgrade head all together
+conn.write(
+  'POST / HTTP/1.1\r\n' +
+  'host: localhost\r\n' +
+  'Upgrade: custom-protocol\r\n' +
+  'Connection: Upgrade\r\n' +
+  'transfer-encoding: chunked\r\n' +
+  'trailer: extra-data\r\n' +
+  '\r\n'
+);
+
+// Make sure the server has processed the above & fired 'upgrade', before the body
+// data starts streaming:
+await upgradeReceivedResolvers.promise;
+
+// Write the body, and include a chunk extension and a trailer header to check
+// that upgrade handling doesn't skip or confuse anything with request parsing:
+conn.write(
+  // 12 byte body sent immediately, with (ignored) chunk extension.
+  'C;chunk-hash=abc\r\nrequest body\r\n' +
+  '0\r\n' +
+  // Request trailer:
+  'extra-data: abc\r\n' +
+  '\r\n' +
+  'upgrade head'
+);
+
+const response = await new Promise((resolve) => conn.once('data', resolve));
+assert.ok(response.startsWith('HTTP/1.1 101 Switching Protocols\r\n'));
+
+// Send more data after connection is confirmed:
+conn.write('\npost-upgrade message');
+conn.end();
+
+await new Promise((resolve) => conn.on('end', resolve));
+
+server.close();

test/parallel/test-http-upgrade-server-with-body.mjs

@@ -25,9 +25,9 @@ server.on('upgrade', function(req, socket, upgradeHead) {
     setTimeout(common.mustCall(() => {
       let socketData = upgradeHead;
 
-      socket.on('data', common.mustCall((d) => {
+      socket.on('data', (d) => {
         socketData = Buffer.concat([socketData, d]);
-      }));
+      });
 
       socket.on('end', common.mustCall(() => {
         assert.strictEqual(socketData.toString(), 'upgrade head\npost-upgrade message');

test/parallel/test-http-upgrade-server-with-large-body-unread.mjs

@@ -29,9 +29,9 @@ server.on('upgrade', function(req, socket, upgradeHead) {
 
     // Collect the raw upgrade stream and check we do eventually get the
     // complete stream:
-    socket.on('data', common.mustCall((d) => {
+    socket.on('data', (d) => {
       socketData = Buffer.concat([socketData, d]);
-    }));
+    });
 
     socket.on('end', common.mustCall(() => {
       assert.strictEqual(socketData.toString(), 'upgrade head\npost-upgrade message');

test/parallel/test-http-upgrade-server-with-large-body.mjs

@@ -36,9 +36,9 @@ server.on('upgrade', function(req, socket, upgradeHead) {
 
   // Start streaming the raw upgrade stream immediately as well, and check we do
   // eventually get the complete stream:
-  socket.on('data', common.mustCall((d) => {
+  socket.on('data', (d) => {
     socketData = Buffer.concat([socketData, d]);
-  }));
+  });
 
   socket.on('end', common.mustCall(() => {
     assert.strictEqual(socketData.toString(), 'upgrade head\npost-upgrade message');