Fix req/res forceful teardown (#19)

Co-authored-by: Yasser Nascimento <[email protected]>
Co-authored-by: Kasper Isager Dalsgarð <[email protected]>

lib/server-connection.js

@@ -1,4 +1,5 @@
 const tcp = require('bare-tcp')
+const { isEnded, isFinished, getStreamError } = require('bare-stream')
 const HTTPIncomingMessage = require('./incoming-message')
 const HTTPServerResponse = require('./server-response')
 const constants = require('./constants')
@@ -33,13 +34,14 @@ module.exports = class HTTPServerConnection {
     this._buffer = null
     this._idle = true
 
-    this._onerror = this._onerror.bind(this)
+    this._onclose = this._onclose.bind(this)
     this._ondata = this._ondata.bind(this)
     this._ondrain = this._ondrain.bind(this)
     this._ontimeout = this._ontimeout.bind(this)
 
     socket
-      .on('error', this._onerror)
+      .on('error', noop)
+      .on('close', this._onclose)
       .on('data', this._ondata)
       .on('drain', this._ondrain)
       .on('timeout', this._ontimeout)
@@ -53,8 +55,11 @@ module.exports = class HTTPServerConnection {
     return this._idle
   }
 
-  _onerror (err) {
-    this.socket.destroy(err)
+  _onclose () {
+    if (this.req && !isEnded(this.req)) this.req.destroy()
+    if (this.res && !isFinished(this.res)) this.res.destroy()
+    const err = getStreamError(this.socket)
+    if (err) this.socket.destroy(err)
   }
 
   _ondata (data) {
@@ -232,11 +237,14 @@ module.exports = class HTTPServerConnection {
 
   _ondetach () {
     this.socket
-      .off('error', this._onerror)
+      .off('error', noop)
+      .off('close', this._onclose)
       .off('data', this._ondata)
       .off('drain', this._ondrain)
       .off('timeout', this._ontimeout)
 
     HTTPServerConnection._connections.delete(this.socket)
   }
 }
+
+function noop () {}

package.json

@@ -26,7 +26,7 @@
   "homepage": "https://github.com/holepunchto/bare-http1#readme",
   "dependencies": {
     "bare-events": "^2.0.0",
-    "bare-stream": "^2.0.0",
+    "bare-stream": "^2.3.0",
     "bare-tcp": "^1.8.0"
   },
   "devDependencies": {

test.js

@@ -1,4 +1,5 @@
 const test = require('brittle')
+const tcp = require('bare-tcp')
 const http = require('.')
 
 test('basic', async function (t) {
@@ -325,6 +326,48 @@ test('destroy socket', async function (t) {
   server.close()
 })
 
+test('close server request/response at premature GET request closure', async function (t) {
+  const sub = t.test('')
+  sub.plan(2)
+
+  const server = http.createServer((req, res) => {
+    req.on('close', () => sub.pass('request closed'))
+    res.on('close', () => sub.pass('response closed'))
+  }).listen(0)
+
+  await waitForServer(server)
+
+  const client = tcp.createConnection(server.address().port)
+  client.write('GET / HTTP/1.1\r\n\r\n')
+
+  setTimeout(() => client.destroy(), 300)
+
+  await sub
+
+  server.close()
+})
+
+test('close server request/response at premature POST request closure', async function (t) {
+  const sub = t.test('')
+  sub.plan(2)
+
+  const server = http.createServer((req, res) => {
+    req.on('close', () => sub.pass('request closed'))
+    res.on('close', () => sub.pass('response closed'))
+  }).listen(0)
+
+  await waitForServer(server)
+
+  const client = tcp.createConnection(server.address().port)
+  client.write('POST / HTTP/1.1\r\nContent-Length: 10000000\r\n\r\n')
+
+  setTimeout(() => client.destroy(), 300)
+
+  await sub
+
+  server.close()
+})
+
 test('server and client do big writes', async function (t) {
   t.plan(8)