bare-http1 4.2.4 → 4.3.0

package/index.d.ts

@@ -99,6 +99,9 @@ export interface HTTPAgentOptions {
 }
 
 export interface HTTPAgent {
+  readonly sockets: IterableIterator<TCPSocket>
+  readonly freeSockets: IterableIterator<TCPSocket>
+
   createConnection(opts?: TCPSocketOptions & TCPSocketConnectOptions): TCPSocket
 
   reuseSocket(socket: TCPSocket, req?: HTTPClientRequest): void

package/lib/agent.js

@@ -2,20 +2,77 @@ const EventEmitter = require('bare-events')
 const tcp = require('bare-tcp')
 const HTTPClientConnection = require('./client-connection')
 
+class HTTPSocketSet {
+  constructor() {
+    this._sockets = new Map()
+  }
+
+  add(name, socket) {
+    const sockets = this._sockets.get(name)
+
+    if (sockets === undefined) this._sockets.set(name, [socket])
+    else sockets.push(socket)
+  }
+
+  pop(name) {
+    const sockets = this._sockets.get(name)
+    if (sockets === undefined || sockets.length === 0) return null
+
+    const last = sockets.pop()
+
+    if (sockets.length === 0) this._sockets.delete(name)
+
+    return last
+  }
+
+  delete(name, socket) {
+    const sockets = this._sockets.get(name)
+    if (sockets === undefined) return
+
+    const i = sockets.indexOf(socket)
+    if (i === -1) return
+
+    const last = sockets.pop()
+    if (last !== socket) sockets[i] = last
+
+    if (sockets.length === 0) this._sockets.delete(name)
+  }
+
+  *sockets() {
+    for (const sockets of this._sockets.values()) {
+      yield* sockets
+    }
+  }
+
+  *[Symbol.iterator]() {
+    for (const [name, sockets] of this._sockets) {
+      for (const socket of sockets) yield [name, socket]
+    }
+  }
+}
+
 module.exports = class HTTPAgent extends EventEmitter {
   constructor(opts = {}) {
     super()
 
     const { keepAlive = false, keepAliveMsecs = 1000 } = opts
 
-    this._sockets = new Map()
-    this._freeSockets = new Map()
+    this._sockets = new HTTPSocketSet()
+    this._freeSockets = new HTTPSocketSet()
 
     this._keepAlive = typeof keepAlive === 'number' ? keepAlive : keepAlive ? keepAliveMsecs : -1
 
     this._opts = { ...opts }
   }
 
+  get sockets() {
+    return this._sockets.sockets()
+  }
+
+  get freeSockets() {
+    return this._freeSockets.sockets()
+  }
+
   createConnection(opts) {
     return tcp.createConnection(opts)
   }
@@ -42,33 +99,26 @@ module.exports = class HTTPAgent extends EventEmitter {
 
     const name = this.getName(opts)
 
-    let socket
-
-    if (this._freeSockets.has(name)) {
-      const sockets = this._freeSockets.get(name)
-
-      socket = sockets.pop()
+    let socket = this._freeSockets.pop(name)
 
-      if (sockets.length === 0) this._freeSockets.delete(name)
-
-      this.reuseSocket(socket, req)
-    } else {
+    if (socket) this.reuseSocket(socket, req)
+    else {
       const agent = this
 
       socket = this.createConnection(opts)
 
-      socket.on('free', onfree).on('end', onremove).on('finish', onremove).on('timeout', ontimeout)
+      socket
+        .on('free', onfree)
+        .on('end', onremove)
+        .on('finish', onremove)
+        .on('close', onremove)
+        .on('timeout', ontimeout)
 
       function onfree() {
         if (socket.destroyed) return
 
         if (agent.keepSocketAlive(socket)) {
-          onremove(false)
-
-          const sockets = agent._freeSockets.get(name)
-
-          if (sockets === undefined) agent._freeSockets.set(name, [socket])
-          else sockets.push(socket)
+          agent._freeSockets.add(name, socket)
         } else {
           socket.end()
         }
@@ -76,41 +126,19 @@ module.exports = class HTTPAgent extends EventEmitter {
         agent.emit('free', socket)
       }
 
-      function onremove(destroy = true) {
-        if (destroy) socket.off('free', onfree)
+      function onremove() {
+        socket.off('free', onfree)
 
-        for (const set of destroy ? [agent._sockets, agent._freeSockets] : [agent._sockets]) {
-          const sockets = set.get(name)
-          if (sockets === undefined) continue
-
-          const i = sockets.indexOf(socket)
-          if (i === -1) continue
-
-          const last = sockets.pop()
-          if (last !== socket) sockets[i] = last
-
-          if (sockets.length === 0) set.delete(name)
-        }
+        agent._sockets.delete(name, socket)
+        agent._freeSockets.delete(name, socket)
       }
 
       function ontimeout() {
-        const sockets = agent._freeSockets.get(name)
-        if (sockets === undefined) return
-
-        const i = sockets.indexOf(socket)
-        if (i === -1) return
-
-        const last = sockets.pop()
-        if (last !== socket) sockets[i] = last
-
-        if (sockets.length === 0) agent._freeSockets.delete(name)
+        agent._freeSockets.delete(name, socket)
       }
     }
 
-    const sockets = this._sockets.get(name)
-
-    if (sockets === undefined) this._sockets.set(name, [socket])
-    else sockets.push(socket)
+    this._sockets.add(name, socket)
 
     req.socket = socket
 
@@ -121,9 +149,7 @@ module.exports = class HTTPAgent extends EventEmitter {
 
   destroy() {
     for (const set of [this._sockets, this._freeSockets]) {
-      for (const [, sockets] of set) {
-        for (const socket of sockets) socket.destroy()
-      }
+      for (const socket of set) socket.destroy()
     }
   }
 

package/package.json

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