bare-http1 3.8.0 → 3.8.2

package/lib/agent.js

@@ -5,11 +5,7 @@ module.exports = class HTTPAgent {
   constructor (opts = {}) {
     const {
       keepAlive = false,
-      keepAliveMsecs = 1000,
-      maxSockets = Infinity,
-      maxTotalSockets = Infinity,
-      maxFreeSockets = 256,
-      timeout = -1
+      keepAliveMsecs = 1000
     } = opts
 
     this._sockets = new Map()
@@ -18,10 +14,6 @@ module.exports = class HTTPAgent {
     this._keepAlive = typeof keepAlive === 'number' ? keepAlive : keepAlive ? keepAliveMsecs : -1
 
     this._opts = { ...opts }
-    this._maxSockets = maxSockets
-    this._maxTotalSockets = maxTotalSockets
-    this._maxFreeSockets = maxFreeSockets
-    this._timeout = timeout
   }
 
   createConnection (opts) {
@@ -65,6 +57,7 @@ module.exports = class HTTPAgent {
       socket
         .on('free', () => this._onfree(socket, name))
         .on('close', () => this._onremove(socket, name))
+        .on('timeout', () => this._ontimeout(socket, name))
     }
 
     let sockets = this._sockets.get(name)
@@ -116,5 +109,13 @@ module.exports = class HTTPAgent {
     }
   }
 
+  _ontimeout (socket, name) {
+    const sockets = this._freeSockets.get(name)
+    if (!sockets) return
+
+    if (sockets.delete(socket)) socket.destroy()
+    if (sockets.size === 0) this._freeSockets.delete(name)
+  }
+
   static global = new this({ keepAlive: 1000, timeout: 5000 })
 }

package/lib/client-request.js

@@ -10,10 +10,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
 
     opts = opts ? { ...opts } : {}
 
-    // TODO: Renable the default global agent when tests have been sorted
-    // const agent = opts.agent === false ? new HTTPAgent() : opts.agent || HTTPAgent.global
-
-    const agent = opts.agent || new HTTPAgent()
+    const agent = opts.agent === false ? new HTTPAgent() : opts.agent || HTTPAgent.global
     const method = opts.method || 'GET'
     const path = opts.path || '/'
     const host = opts.host = opts.host || 'localhost'

package/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,7 +237,8 @@ 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)
@@ -240,3 +246,5 @@ module.exports = class HTTPServerConnection {
     HTTPServerConnection._connections.delete(this.socket)
   }
 }
+
+function noop () {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -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": {