bare-http1 4.3.0 → 4.3.1

package/index.d.ts

@@ -118,7 +118,7 @@ export interface HTTPAgent {
 class HTTPAgent {
   constructor(opts?: HTTPAgentOptions & TCPSocketOptions & TCPSocketConnectOptions)
 
-  static global: HTTPAgent
+  static readonly global: HTTPAgent
 }
 
 export const globalAgent: HTTPAgent

package/lib/agent.js

@@ -5,11 +5,18 @@ const HTTPClientConnection = require('./client-connection')
 class HTTPSocketSet {
   constructor() {
     this._sockets = new Map()
+    this._size = 0
+  }
+
+  get size() {
+    return this._size
   }
 
   add(name, socket) {
     const sockets = this._sockets.get(name)
 
+    this._size++
+
     if (sockets === undefined) this._sockets.set(name, [socket])
     else sockets.push(socket)
   }
@@ -18,6 +25,8 @@ class HTTPSocketSet {
     const sockets = this._sockets.get(name)
     if (sockets === undefined || sockets.length === 0) return null
 
+    this._size--
+
     const last = sockets.pop()
 
     if (sockets.length === 0) this._sockets.delete(name)
@@ -32,6 +41,8 @@ class HTTPSocketSet {
     const i = sockets.indexOf(socket)
     if (i === -1) return
 
+    this._size--
+
     const last = sockets.pop()
     if (last !== socket) sockets[i] = last
 
@@ -51,7 +62,7 @@ class HTTPSocketSet {
   }
 }
 
-module.exports = class HTTPAgent extends EventEmitter {
+class HTTPAgent extends EventEmitter {
   constructor(opts = {}) {
     super()
 
@@ -109,10 +120,10 @@ module.exports = class HTTPAgent extends EventEmitter {
 
       socket
         .on('free', onfree)
+        .on('timeout', ontimeout)
         .on('end', onremove)
         .on('finish', onremove)
         .on('close', onremove)
-        .on('timeout', ontimeout)
 
       function onfree() {
         if (socket.destroyed) return
@@ -126,18 +137,24 @@ module.exports = class HTTPAgent extends EventEmitter {
         agent.emit('free', socket)
       }
 
+      function ontimeout() {
+        socket.destroy()
+
+        agent._freeSockets.delete(name, socket)
+      }
+
       function onremove() {
         socket.off('free', onfree)
 
         agent._sockets.delete(name, socket)
         agent._freeSockets.delete(name, socket)
-      }
 
-      function ontimeout() {
-        agent._freeSockets.delete(name, socket)
+        if (agent._sockets.size === 0) HTTPAgent._agents.delete(agent)
       }
     }
 
+    if (this._sockets.size === 0) HTTPAgent._agents.add(this)
+
     this._sockets.add(name, socket)
 
     req.socket = socket
@@ -148,10 +165,23 @@ module.exports = class HTTPAgent extends EventEmitter {
   }
 
   destroy() {
-    for (const set of [this._sockets, this._freeSockets]) {
-      for (const socket of set) socket.destroy()
-    }
+    for (const socket of this._sockets.sockets()) socket.destroy()
+  }
+
+  static _global = new this({ keepAlive: 1000, timeout: 5000 })
+  static _agents = new Set()
+
+  static get global() {
+    return this._global
   }
 
-  static global = new this({ keepAlive: 1000, timeout: 5000 })
+  static _onidle() {
+    for (const agent of this._agents) {
+      for (const socket of agent._sockets.sockets()) socket.destroy()
+    }
+  }
 }
+
+module.exports = HTTPAgent
+
+Bare.on('idle', HTTPAgent._onidle.bind(HTTPAgent))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     "./package": "./package.json",