Use on-finished to determine when body read

expressjs · Dec 16, 2021 · 6467f4c · 6467f4c
1 parent 8e4def6
commit 6467f4c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,6 +2,7 @@
 ===
 
   * `urlencoded` parser now defaults `extended` to `false`
+  * Use `on-finished` to determine when body read
 
 1.19.1 / 2021-12-10
 ===================

diff --git a/lib/read.js b/lib/read.js
@@ -40,9 +40,6 @@ function read (req, res, next, parse, debug, options) {
   var opts = options
   var stream
 
-  // flag as parsed
-  req._body = true
-
   // read options
   var encoding = opts.encoding !== null
     ? opts.encoding

diff --git a/lib/types/json.js b/lib/types/json.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:json')
+var isFinished = require('on-finished').isFinished
 var read = require('../read')
 var typeis = require('type-is')
 
@@ -96,7 +97,7 @@ function json (options) {
   }
 
   return function jsonParser (req, res, next) {
-    if (req._body) {
+    if (isFinished(req)) {
       debug('body already parsed')
       next()
       return

diff --git a/lib/types/raw.js b/lib/types/raw.js
@@ -12,6 +12,7 @@
 
 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')
 
@@ -53,7 +54,7 @@ function raw (options) {
   }
 
   return function rawParser (req, res, next) {
-    if (req._body) {
+    if (isFinished(req)) {
       debug('body already parsed')
       next()
       return

diff --git a/lib/types/text.js b/lib/types/text.js
@@ -13,6 +13,7 @@
 var bytes = require('bytes')
 var contentType = require('content-type')
 var debug = require('debug')('body-parser:text')
+var isFinished = require('on-finished').isFinished
 var read = require('../read')
 var typeis = require('type-is')
 
@@ -55,7 +56,7 @@ function text (options) {
   }
 
   return function textParser (req, res, next) {
-    if (req._body) {
+    if (isFinished(req)) {
       debug('body already parsed')
       next()
       return

diff --git a/lib/types/urlencoded.js b/lib/types/urlencoded.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:urlencoded')
+var isFinished = require('on-finished').isFinished
 var read = require('../read')
 var typeis = require('type-is')
 
@@ -71,7 +72,7 @@ function urlencoded (options) {
   }
 
   return function urlencodedParser (req, res, next) {
-    if (req._body) {
+    if (isFinished(req)) {
       debug('body already parsed')
       next()
       return