http2: refactor trailers API

Rather than using the `'fetchTrailers'` event to collect trailers,
a new `getTrailers` callback option is supported. If not set, the
internals will skip calling out for trailers at all. Expands the
test to make sure trailers work from the client side also.

PR-URL: https://github.com/nodejs/node/pull/14239
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

1 files changed, 13 insertions, 6 deletions

diff --git a/test/parallel/test-http2-trailers.js b/test/parallel/test-http2-trailers.js
index 04ad3b0ff9..ed2d4b9e53 100644
--- a/test/parallel/test-http2-trailers.js
+++ b/test/parallel/test-http2-trailers.js
@@ -15,12 +15,16 @@ const server = h2.createServer();
 server.on('stream', common.mustCall(onStream));
 
 function onStream(stream, headers, flags) {
+  stream.on('trailers', common.mustCall((headers) => {
+    assert.strictEqual(headers[trailerKey], trailerValue);
+  }));
   stream.respond({
     'content-type': 'text/html',
     ':status': 200
-  });
-  stream.on('fetchTrailers', function(trailers) {
-    trailers[trailerKey] = trailerValue;
+  }, {
+    getTrailers: common.mustCall((trailers) => {
+      trailers[trailerKey] = trailerValue;
+    })
   });
   stream.end(body);
 }
@@ -29,16 +33,19 @@ server.listen(0);
 
 server.on('listening', common.mustCall(function() {
   const client = h2.connect(`http://localhost:${this.address().port}`);
-  const req = client.request({ ':path': '/' });
+  const req = client.request({ ':path': '/', ':method': 'POST' }, {
+    getTrailers: common.mustCall((trailers) => {
+      trailers[trailerKey] = trailerValue;
+    })
+  });
   req.on('data', common.mustCall());
   req.on('trailers', common.mustCall((headers) => {
     assert.strictEqual(headers[trailerKey], trailerValue);
-    req.end();
   }));
   req.on('end', common.mustCall(() => {
     server.close();
     client.destroy();
   }));
-  req.end();
+  req.end('data');
 
 }));