feat: Added support for request body inflation

closes #38

lib/form.js

@@ -4,6 +4,7 @@
  */
 
 var raw = require('raw-body');
+var inflate = require('inflation');
 var qs = require('qs');
 
 /**
@@ -24,13 +25,14 @@ module.exports = function(req, opts){
 
   // defaults
   var len = req.headers['content-length'];
-  if (len) opts.length = ~~len;
+  var encoding = req.headers['content-encoding'] || 'identity';
+  if (len && encoding === 'identity') opts.length = ~~len;
   opts.encoding = opts.encoding || 'utf8';
   opts.limit = opts.limit || '56kb';
   opts.qs = opts.qs || qs;
 
   // raw-body returns a Promise when no callback is specified
-  return raw(req, opts)
+  return raw(inflate(req), opts)
     .then(function(str){
       try {
         return opts.qs.parse(str, opts.queryString);

lib/json.js

@@ -4,6 +4,7 @@
  */
 
 var raw = require('raw-body');
+var inflate = require('inflation');
 
 // Allowed whitespace is defined in RFC 7159
 // http://www.rfc-editor.org/rfc/rfc7159.txt
@@ -27,13 +28,14 @@ module.exports = function(req, opts){
 
   // defaults
   var len = req.headers['content-length'];
-  if (len) opts.length = len = ~~len;
+  var encoding = req.headers['content-encoding'] || 'identity';
+  if (len && encoding === 'identity') opts.length = len = ~~len;
   opts.encoding = opts.encoding || 'utf8';
   opts.limit = opts.limit || '1mb';
   var strict = opts.strict !== false;
 
   // raw-body returns a promise when no callback is specified
-  return raw(req, opts)
+  return raw(inflate(req), opts)
     .then(function(str) {
       try {
         return parse(str);

lib/text.js

@@ -3,6 +3,7 @@
  */
 
 var raw = require('raw-body');
+var inflate = require('inflation');
 
 /**
  * Return a Promise which parses text/plain requests.
@@ -22,10 +23,11 @@ module.exports = function(req, opts){
 
   // defaults
   var len = req.headers['content-length'];
-  if (len) opts.length = ~~len;
+  var encoding = req.headers['content-encoding'] || 'identity';
+  if (len && encoding === 'identity') opts.length = ~~len;
   opts.encoding = opts.encoding || 'utf8';
   opts.limit = opts.limit || '1mb';
 
   // raw-body returns a Promise when no callback is specified
-  return raw(req, opts);
+  return raw(inflate(req), opts);
 };

package.json

@@ -15,6 +15,7 @@
   "dependencies": {
     "qs": "~4.0.0",
     "raw-body": "~2.1.2",
+    "inflation": "~2.0.0",
     "type-is": "~1.6.6"
   },
   "devDependencies": {

test/any.js

@@ -2,6 +2,7 @@
 var request = require('supertest');
 var parse = require('..');
 var koa = require('koa');
+var zlib = require('zlib');
 
 describe('parse(req, opts)', function(){
   describe('with valid form body', function(){
@@ -147,4 +148,57 @@ describe('parse(req, opts)', function(){
       .expect(415, 'Unsupported Media Type', done);
     })
   })
+
+  describe('with content-encoding', function(){
+    it('should inflate gzip', function(done){
+      var app = koa();
+      var json = JSON.stringify({ foo: 'bar' });
+
+      app.use(function *(){
+        var body = yield parse(this);
+        body.should.eql({ foo: 'bar' });
+        done();
+      });
+
+      var req = request(app.listen())
+        .post('/')
+        .type('json')
+        .set('Content-Encoding', 'gzip');
+      req.write(zlib.gzipSync(json));
+      req.end(function(){});
+    })
+    it('should inflate deflate', function(done){
+      var app = koa();
+      var json = JSON.stringify({ foo: 'bar' });
+
+      app.use(function *(){
+        var body = yield parse(this);
+        body.should.eql({ foo: 'bar' });
+        done();
+      });
+
+      var req = request(app.listen())
+        .post('/')
+        .type('json')
+        .set('Content-Encoding', 'deflate');
+      req.write(zlib.deflateSync(json));
+      req.end(function(){});
+    })
+    it('should pass-through identity', function(done){
+      var app = koa();
+
+      app.use(function *(){
+        var body = yield parse(this);
+        body.should.eql({ foo: 'bar' });
+        done();
+      });
+
+      request(app.listen())
+      .post('/')
+      .set('Content-Encoding', 'identity')
+      .send({ foo: 'bar' })
+      .end(function(){});
+    })
+  })
+
 })