Fix hasBody with http2 request while or after 'end' event

jshttp · Aug 9, 2018 · 97c0d7a · 97c0d7a
1 parent 9efda35
commit 97c0d7a
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -97,7 +97,7 @@ function typeis (value, types_) {
  */
 
 function hasbody (req) {
-  return (ishttp2(req) && (req.stream.readable || req.stream._readableState.endEmitted)) ||
+  return (ishttp2(req) && (req.stream.readable || !req.stream._readableState.sync)) ||
     req.headers['transfer-encoding'] !== undefined ||
     !isNaN(req.headers['content-length'])
 }

diff --git a/test/test.js b/test/test.js
@@ -243,6 +243,36 @@ describe('typeis.hasBody(req)', function () {
         })
       })
 
+      it('should not indicate body after end event occurred', function (done) {
+        createBodylessRequest('', function (req) {
+          var data = ''
+          req.on('data', function (chunk) {
+            data += chunk
+          })
+          req.on('end', function (chunk) {
+            process.nextTick(function () {
+              assert.strictEqual(data, '')
+              assert.strictEqual(typeis.hasBody(req), false)
+              done()
+            })
+          })
+        })
+      })
+
+      it('should not indicate body while end event occurred', function (done) {
+        createBodylessRequest('', function (req) {
+          var data = ''
+          req.on('data', function (chunk) {
+            data += chunk
+          })
+          req.on('end', function (chunk) {
+            assert.strictEqual(data, '')
+            assert.strictEqual(typeis.hasBody(req), false)
+            done()
+          })
+        })
+      })
+
       it('should indicate body', function (done) {
         createRequest('', function (req) {
           assert.strictEqual(typeis.hasBody(req), true)
@@ -265,6 +295,29 @@ describe('typeis.hasBody(req)', function () {
           })
         })
       })
+
+      it('should indicate body while end event occurred', function (done) {
+        createRequest('', function (req) {
+          var data = ''
+          req.on('data', function (chunk) {
+            data += chunk
+          })
+          req.on('end', function (chunk) {
+            assert.strictEqual(data, 'hello')
+            assert.strictEqual(typeis.hasBody(req), true)
+            done()
+          })
+        })
+      })
+
+      it('should indicate body while data event', function (done) {
+        createRequest('', function (req) {
+          req.on('data', function (chunk) {
+            assert.strictEqual(typeis.hasBody(req), true)
+            done()
+          })
+        })
+      })
     })
   }
 })