From 0ff4a558afeb0ec051041e8f1f9c45d876ae0530 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 4 Oct 2019 20:37:51 +0200 Subject: http2: allow passing FileHandle to respondWithFD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This seems to make sense if we want to promote the use of `fs.promises`, although it’s not strictly necessary. PR-URL: https://github.com/nodejs/node/pull/29876 Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Minwoo Jung Reviewed-By: Ruben Bridgewater --- test/parallel/test-http2-respond-file-fd-errors.js | 3 +- .../parallel/test-http2-respond-file-filehandle.js | 47 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 test/parallel/test-http2-respond-file-filehandle.js (limited to 'test') diff --git a/test/parallel/test-http2-respond-file-fd-errors.js b/test/parallel/test-http2-respond-file-fd-errors.js index 9508cfae97..5de21e7855 100644 --- a/test/parallel/test-http2-respond-file-fd-errors.js +++ b/test/parallel/test-http2-respond-file-fd-errors.js @@ -42,7 +42,8 @@ server.on('stream', common.mustCall((stream) => { { type: TypeError, code: 'ERR_INVALID_ARG_TYPE', - message: 'The "fd" argument must be of type number. Received type ' + + message: 'The "fd" argument must be one of type number or FileHandle.' + + ' Received type ' + typeof types[type] } ); diff --git a/test/parallel/test-http2-respond-file-filehandle.js b/test/parallel/test-http2-respond-file-filehandle.js new file mode 100644 index 0000000000..bc7bfbe356 --- /dev/null +++ b/test/parallel/test-http2-respond-file-filehandle.js @@ -0,0 +1,47 @@ +'use strict'; + +const common = require('../common'); +const fixtures = require('../common/fixtures'); +if (!common.hasCrypto) + common.skip('missing crypto'); +const http2 = require('http2'); +const assert = require('assert'); +const fs = require('fs'); + +const { + HTTP2_HEADER_CONTENT_TYPE, + HTTP2_HEADER_CONTENT_LENGTH +} = http2.constants; + +const fname = fixtures.path('elipses.txt'); +const data = fs.readFileSync(fname); +const stat = fs.statSync(fname); +fs.promises.open(fname, 'r').then(common.mustCall((fileHandle) => { + const server = http2.createServer(); + server.on('stream', (stream) => { + stream.respondWithFD(fileHandle, { + [HTTP2_HEADER_CONTENT_TYPE]: 'text/plain', + [HTTP2_HEADER_CONTENT_LENGTH]: stat.size, + }); + }); + server.on('close', common.mustCall(() => fileHandle.close())); + server.listen(0, common.mustCall(() => { + + const client = http2.connect(`http://localhost:${server.address().port}`); + const req = client.request(); + + req.on('response', common.mustCall((headers) => { + assert.strictEqual(headers[HTTP2_HEADER_CONTENT_TYPE], 'text/plain'); + assert.strictEqual(+headers[HTTP2_HEADER_CONTENT_LENGTH], data.length); + })); + req.setEncoding('utf8'); + let check = ''; + req.on('data', (chunk) => check += chunk); + req.on('end', common.mustCall(() => { + assert.strictEqual(check, data.toString('utf8')); + client.close(); + server.close(); + })); + req.end(); + })); +})); -- cgit v1.2.3