mirror of https://github.com/lukechilds/node.git
Browse Source
* respondWithFD now supports optional statCheck * respondWithFD and respondWithFile both support offset/length for range requests * Fix linting nits following most recent update 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>v6
James M Snell
7 years ago
33 changed files with 350 additions and 72 deletions
@ -0,0 +1,94 @@ |
|||
// Flags: --expose-http2
|
|||
'use strict'; |
|||
|
|||
// Tests the ability to minimally request a byte range with respondWithFD
|
|||
|
|||
const common = require('../common'); |
|||
const http2 = require('http2'); |
|||
const assert = require('assert'); |
|||
const path = require('path'); |
|||
const fs = require('fs'); |
|||
|
|||
const { |
|||
HTTP2_HEADER_CONTENT_TYPE, |
|||
HTTP2_HEADER_CONTENT_LENGTH |
|||
} = http2.constants; |
|||
|
|||
const fname = path.resolve(common.fixturesDir, 'printA.js'); |
|||
const data = fs.readFileSync(fname); |
|||
const fd = fs.openSync(fname, 'r'); |
|||
|
|||
// Note: this is not anywhere close to a proper implementation of the range
|
|||
// header.
|
|||
function getOffsetLength(range) { |
|||
if (range === undefined) |
|||
return [0, -1]; |
|||
const r = /bytes=(\d+)-(\d+)/.exec(range); |
|||
return [+r[1], +r[2] - +r[1]]; |
|||
} |
|||
|
|||
const server = http2.createServer(); |
|||
server.on('stream', (stream, headers) => { |
|||
|
|||
const [ offset, length ] = getOffsetLength(headers.range); |
|||
|
|||
stream.respondWithFD(fd, { |
|||
[HTTP2_HEADER_CONTENT_TYPE]: 'text/plain' |
|||
}, { |
|||
statCheck: common.mustCall((stat, headers, options) => { |
|||
assert.strictEqual(options.length, length); |
|||
assert.strictEqual(options.offset, offset); |
|||
headers[HTTP2_HEADER_CONTENT_LENGTH] = |
|||
Math.min(options.length, stat.size - offset); |
|||
}), |
|||
offset: offset, |
|||
length: length |
|||
}); |
|||
}); |
|||
server.on('close', common.mustCall(() => fs.closeSync(fd))); |
|||
server.listen(0, () => { |
|||
const client = http2.connect(`http://localhost:${server.address().port}`); |
|||
|
|||
let remaining = 2; |
|||
function maybeClose() { |
|||
if (--remaining === 0) { |
|||
client.destroy(); |
|||
server.close(); |
|||
} |
|||
} |
|||
|
|||
{ |
|||
const req = client.request({ range: 'bytes=8-11' }); |
|||
|
|||
req.on('response', common.mustCall((headers) => { |
|||
assert.strictEqual(headers[HTTP2_HEADER_CONTENT_TYPE], 'text/plain'); |
|||
assert.strictEqual(+headers[HTTP2_HEADER_CONTENT_LENGTH], 3); |
|||
})); |
|||
req.setEncoding('utf8'); |
|||
let check = ''; |
|||
req.on('data', (chunk) => check += chunk); |
|||
req.on('end', common.mustCall(() => { |
|||
assert.strictEqual(check, data.toString('utf8', 8, 11)); |
|||
})); |
|||
req.on('streamClosed', common.mustCall(maybeClose)); |
|||
req.end(); |
|||
} |
|||
|
|||
{ |
|||
const req = client.request({ range: 'bytes=8-28' }); |
|||
|
|||
req.on('response', common.mustCall((headers) => { |
|||
assert.strictEqual(headers[HTTP2_HEADER_CONTENT_TYPE], 'text/plain'); |
|||
assert.strictEqual(+headers[HTTP2_HEADER_CONTENT_LENGTH], 9); |
|||
})); |
|||
req.setEncoding('utf8'); |
|||
let check = ''; |
|||
req.on('data', (chunk) => check += chunk); |
|||
req.on('end', common.mustCall(() => { |
|||
assert.strictEqual(check, data.toString('utf8', 8, 28)); |
|||
})); |
|||
req.on('streamClosed', common.mustCall(maybeClose)); |
|||
req.end(); |
|||
} |
|||
|
|||
}); |
|||
@ -0,0 +1,52 @@ |
|||
// Flags: --expose-http2
|
|||
'use strict'; |
|||
|
|||
const common = require('../common'); |
|||
const http2 = require('http2'); |
|||
const assert = require('assert'); |
|||
const path = require('path'); |
|||
const fs = require('fs'); |
|||
|
|||
const { |
|||
HTTP2_HEADER_CONTENT_TYPE, |
|||
HTTP2_HEADER_CONTENT_LENGTH, |
|||
HTTP2_HEADER_LAST_MODIFIED |
|||
} = http2.constants; |
|||
|
|||
const fname = path.resolve(common.fixturesDir, 'printA.js'); |
|||
const data = fs.readFileSync(fname); |
|||
const stat = fs.statSync(fname); |
|||
|
|||
const server = http2.createServer(); |
|||
server.on('stream', (stream) => { |
|||
stream.respondWithFile(fname, { |
|||
[HTTP2_HEADER_CONTENT_TYPE]: 'text/plain' |
|||
}, { |
|||
statCheck: common.mustCall((stat, headers) => { |
|||
headers[HTTP2_HEADER_LAST_MODIFIED] = stat.mtime.toUTCString(); |
|||
}), |
|||
offset: 8, |
|||
length: 3 |
|||
}); |
|||
}); |
|||
server.listen(0, () => { |
|||
|
|||
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], 3); |
|||
assert.strictEqual(headers[HTTP2_HEADER_LAST_MODIFIED], |
|||
stat.mtime.toUTCString()); |
|||
})); |
|||
req.setEncoding('utf8'); |
|||
let check = ''; |
|||
req.on('data', (chunk) => check += chunk); |
|||
req.on('end', common.mustCall(() => { |
|||
assert.strictEqual(check, data.toString('utf8', 8, 11)); |
|||
client.destroy(); |
|||
server.close(); |
|||
})); |
|||
req.end(); |
|||
}); |
|||
Loading…
Reference in new issue