habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding check and test for deflate algo

Browse Source
This commit is contained in:
Marcelo Gornstein
2014-09-04 18:14:42 -03:00
parent aec0333a91
commit 83b6400000
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/connectors/http.js
View File

@ -147,7 +147,8 @@ HttpConnector.prototype.request = function (params, cb) {
cb(err);
} else {
response = Buffer.concat(buffers);
if (headers['content-encoding'] && headers['content-encoding'].match(/gzip/i)) {
var zipHdr = headers['content-encoding'];
if (zipHdr && (zipHdr.match(/gzip/i) || zipHdr.match(/deflate/i))) {
zlib.unzip(response, function(gzErr, uncompressedResponse) {
if(gzErr) {
err = gzErr;

36
test/unit/specs/http_connector.js
View File

@ -304,11 +304,15 @@ describe('Http Connector', function () {
});
});
it('collects the whole request body (compressed)', function (done) {
it('collects the whole request body (gzip compressed)', function (done) {
var server = nock('http://esjs.com:9200');
var con = new HttpConnection(new Host('http://esjs.com:9200'));
var body = '{ "USER": "doc" }';
zlib.deflate(body, function(err, compressedBody) {
var elements = [];
for(var i = 0; i < 500; i++) {
elements.push({ "USER": "doc" });
}
var body = JSON.stringify(elements);
zlib.gzip(body, function(err, compressedBody) {
server
.get('/users/1')
.reply(200, compressedBody, {'Content-Encoding': 'gzip'});
@ -326,6 +330,32 @@ describe('Http Connector', function () {
});
});
it('collects the whole request body (deflate compressed)', function (done) {
var server = nock('http://esjs.com:9200');
var con = new HttpConnection(new Host('http://esjs.com:9200'));
var elements = [];
for(var i = 0; i < 500; i++) {
elements.push({ "USER": "doc" });
}
var body = JSON.stringify(elements);
zlib.deflate(body, function(err, compressedBody) {
server
.get('/users/1')
.reply(200, compressedBody, {'Content-Encoding': 'deflate'});
con.request({
method: 'GET',
path: '/users/1'
}, function (err, resp, status) {
expect(err).to.be(undefined);
expect(resp).to.eql(body);
expect(status).to.eql(200);
server.done();
done();
});
});
});
it('Can handle uncompress errors', function (done) {
var server = nock('http://esjs.com:9200');
var con = new HttpConnection(new Host('http://esjs.com:9200'));