converted raw parser to use generic parser

Author: Shawn Dellysse

lib/generic-parser.js

@@ -16,6 +16,7 @@ var bytes = require('bytes')
 var contentType = require('content-type')
 var createError = require('http-errors')
 var debug = require('debug')('body-parser:generic')
+var isFinished = require('on-finished').isFinished
 var read = require('./read')
 var typeis = require('type-is')
 
@@ -62,13 +63,15 @@ function generic (options) {
     : charset
 
   return function genericParser (req, res, next) {
-    if (req._body) {
+    if (isFinished(req)) {
       debug('body already parsed')
       next()
       return
     }
 
-    req.body = req.body || {}
+    if (!('body' in req)) {
+      req.body = undefined
+    }
 
     // skip requests without bodies
     if (!typeis.hasBody(req)) {

lib/types/raw.js

@@ -10,11 +10,8 @@
  * Module dependencies.
  */
 
-var bytes = require('bytes')
-var debug = require('debug')('body-parser:raw')
-var isFinished = require('on-finished').isFinished
-var read = require('../read')
-var typeis = require('type-is')
+var assign = require('object-assign')
+var genericParser = require('../generic-parser')
 
 /**
  * Module exports.
@@ -33,77 +30,9 @@ module.exports = raw
 function raw (options) {
   var opts = options || {}
 
-  var inflate = opts.inflate !== false
-  var limit = typeof opts.limit !== 'number'
-    ? bytes.parse(opts.limit || '100kb')
-    : opts.limit
   var type = opts.type || 'application/octet-stream'
-  var verify = opts.verify || false
-  var parser = opts.parser || defaultParser
 
-  if (verify !== false && typeof verify !== 'function') {
-    throw new TypeError('option verify must be function')
-  }
-
-  // create the appropriate type checking function
-  var shouldParse = typeof type !== 'function'
-    ? typeChecker(type)
-    : type
-
-  function parse (buf) {
-    return parser(buf)
-  }
-
-  return function rawParser (req, res, next) {
-    if (isFinished(req)) {
-      debug('body already parsed')
-      next()
-      return
-    }
-
-    if (!('body' in req)) {
-      req.body = undefined
-    }
-
-    // skip requests without bodies
-    if (!typeis.hasBody(req)) {
-      debug('skip empty body')
-      next()
-      return
-    }
-
-    debug('content-type %j', req.headers['content-type'])
-
-    // determine if request should be parsed
-    if (!shouldParse(req)) {
-      debug('skip parsing')
-      next()
-      return
-    }
-
-    // read
-    read(req, res, next, parse, debug, {
-      encoding: null,
-      inflate: inflate,
-      limit: limit,
-      verify: verify
-    })
-  }
-}
-
-function defaultParser (buf) {
-  return buf
-}
-
-/**
- * Get the simple type checker.
- *
- * @param {string} type
- * @return {function}
- */
-
-function typeChecker (type) {
-  return function checkType (req) {
-    return Boolean(typeis(req, type))
-  }
+  return genericParser(assign({}, opts, {
+    type: type
+  }))
 }

test/raw.js

@@ -20,16 +20,6 @@ describe('bodyParser.raw()', function () {
       .expect(200, 'buf:746865207573657220697320746f6269', done)
   })
 
-  it('should parse application/octet-stream with a custom parser', function (done) {
-    request(createServer({
-      parser: function (body) { return body.toString('utf8') }
-    }))
-    .post('/')
-    .set('Content-Type', 'application/octet-stream')
-    .send('the user is tobi')
-    .expect(200, '"the user is tobi"', done)
-  })
-
   it('should 400 when invalid content-length', function (done) {
     var rawParser = bodyParser.raw()
     var server = createServer(function (req, res, next) {