Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/use write head instead of implicit header #170

Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function compression (options) {
}

if (!this._header) {
this._implicitHeader()
this.writeHead(this.statusCode)
}

return stream
Expand All @@ -100,7 +100,7 @@ function compression (options) {
length = chunkLength(chunk, encoding)
}

this._implicitHeader()
this.writeHead(this.statusCode)
}

if (!stream) {
Expand Down
86 changes: 86 additions & 0 deletions test/compression.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ var http = require('http')
var request = require('supertest')
var zlib = require('zlib')

var describeHttp2 = describe.skip
try {
var http2 = require('http2')
describeHttp2 = describe
} catch (err) {
if (err) {
console.log('http2 tests disabled.')
}
Icehunter marked this conversation as resolved.
Show resolved Hide resolved
}

var compression = require('..')

describe('compression()', function () {
Expand Down Expand Up @@ -305,6 +315,41 @@ describe('compression()', function () {
.expect(200, done)
})

describeHttp2('http2', function () {
it('should work with http2 server', function (done) {
var server = createHttp2Server({ threshold: 0 }, function (req, res) {
res.setHeader(http2.constants.HTTP2_HEADER_CONTENT_TYPE, 'text/plain')
res.end('hello, world')
})
server.on('listening', function () {
var client = createHttp2Client(server.address().port)
// using ES5 as Node.js <=4.0.0 does not have Computed Property Names
var reqHeaders = {}
reqHeaders[http2.constants.HTTP2_HEADER_ACCEPT_ENCODING] = 'gzip'
var request = client.request(reqHeaders)
request.on('response', function (headers) {
assert.strictEqual(headers[http2.constants.HTTP2_HEADER_STATUS], 200)
assert.strictEqual(headers[http2.constants.HTTP2_HEADER_CONTENT_TYPE], 'text/plain')
assert.strictEqual(headers[http2.constants.HTTP2_HEADER_CONTENT_ENCODING], 'gzip')
})
Icehunter marked this conversation as resolved.
Show resolved Hide resolved
var chunks = []
request.on('data', function (chunk) {
chunks.push(chunk)
})
request.on('end', function () {
closeHttp2(client, server, function () {
zlib.gunzip(Buffer.concat(chunks), function (err, data) {
assert.ok(!err)
assert.strictEqual(data.toString(), 'hello, world')
done()
})
})
})
request.end()
})
})
})

describe('threshold', function () {
it('should not compress responses below the threshold size', function (done) {
var server = createServer({ threshold: '1kb' }, function (req, res) {
Expand Down Expand Up @@ -674,6 +719,47 @@ function createServer (opts, fn) {
})
}

function createHttp2Server (opts, fn) {
var _compression = compression(opts)
var server = http2.createServer(function (req, res) {
_compression(req, res, function (err) {
if (err) {
res.statusCode = err.status || 500
res.end(err.message)
return
}

fn(req, res)
})
})
server.listen(0, '127.0.0.1')
return server
}

function createHttp2Client (port) {
return http2.connect('http://127.0.0.1:' + port)
}

function closeHttp2 (client, server, callback) {
if (typeof client.shutdown === 'function') {
// this is the node v8.x way of closing the connections
client.shutdown({}, function () {
server.close(function () {
callback()
})
})
Icehunter marked this conversation as resolved.
Show resolved Hide resolved
} else {
// this is the node v9.x onwards way of closing the connections
client.close(function () {
// force existing connections to time out after 1ms.
// this is done to force the server to close in some cases where it wouldn't do it otherwise.
server.close(function () {
callback()
})
})
Icehunter marked this conversation as resolved.
Show resolved Hide resolved
}
}

function shouldHaveBodyLength (length) {
return function (res) {
assert.strictEqual(res.text.length, length, 'should have body length of ' + length)
Expand Down