bare-http1 4.1.3 → 4.1.5

package/index.d.ts

@@ -56,7 +56,7 @@ export interface HTTPIncomingMessage<
   setTimeout(ms: number, ontimeout?: () => void): this
 }
 
-export class HTTPIncomingMessage {
+class HTTPIncomingMessage extends Readable {
   constructor(
     socket?: TCPSocket,
     headers?: Record<string, string | number>,
@@ -87,7 +87,7 @@ export interface HTTPOutgoingMessage<
   setTimeout(ms: number, ontimeout?: () => void): this
 }
 
-export class HTTPOutgoingMessage {
+class HTTPOutgoingMessage extends Writable {
   constructor(socket?: TCPSocket)
 }
 
@@ -112,7 +112,7 @@ export interface HTTPAgent {
   destroy(): void
 }
 
-export class HTTPAgent {
+class HTTPAgent {
   constructor(opts?: HTTPAgentOptions & TCPSocketOptions & TCPSocketConnectOptions)
 
   static global: HTTPAgent
@@ -134,7 +134,7 @@ export interface HTTPServer<M extends HTTPServerEvents = HTTPServerEvents> exten
   setTimeout(ms: number, ontimeout?: () => void): this
 }
 
-export class HTTPServer {
+class HTTPServer extends TCPServer {
   constructor(
     opts?: HTTPServerConnectionOptions,
     onrequest?: (req: HTTPIncomingMessage, res: HTTPServerResponse) => void
@@ -159,7 +159,7 @@ export interface HTTPServerResponse extends HTTPOutgoingMessage {
   writeHead(statusCode: HTTPStatusCode, headers?: Record<string, string | number>): void
 }
 
-export class HTTPServerResponse {
+class HTTPServerResponse extends HTTPOutgoingMessage {
   constructor(socket: TCPSocket, req: HTTPIncomingMessage, close: boolean)
 }
 
@@ -176,9 +176,11 @@ export interface HTTPServerConnection {
 
   readonly req: HTTPIncomingMessage | null
   readonly res: HTTPServerResponse | null
+
+  readonly idle: boolean
 }
 
-export class HTTPServerConnection {
+class HTTPServerConnection {
   constructor(server: HTTPServer, socket: TCPSocket, opts?: HTTPServerConnectionOptions)
 
   static for(socket: TCPSocket): HTTPServerConnection
@@ -205,7 +207,7 @@ export interface HTTPClientRequest<M extends HTTPClientRequestEvents = HTTPClien
   readonly headers: Record<string, string | number>
 }
 
-export class HTTPClientRequest {
+class HTTPClientRequest extends HTTPOutgoingMessage {
   constructor(opts?: HTTPClientRequestOptions, onresponse?: () => void)
 
   constructor(onresponse: () => void)
@@ -226,7 +228,7 @@ export interface HTTPClientConnection {
   readonly idle: boolean
 }
 
-export class HTTPClientConnection {
+class HTTPClientConnection {
   constructor(socket: TCPSocket, opts?: HTTPClientConnectionOptions)
 
   static for(socket: TCPSocket): HTTPClientConnection | null

package/index.js

@@ -43,9 +43,6 @@ exports.request = function request(url, opts, onresponse) {
     opts.port = typeof opts.port === 'string' ? parseInt(opts.port, 10) : opts.port
   }
 
-  // TODO: Renable the default global agent when hangs have been sorted
-  opts.agent = opts.agent || new exports.Agent()
-
   return new exports.ClientRequest(opts, onresponse)
 }
 

package/lib/agent.js

@@ -1,13 +1,12 @@
+const EventEmitter = require('bare-events')
 const tcp = require('bare-tcp')
 const HTTPClientConnection = require('./client-connection')
-const EventEmitter = require('bare-events')
 
 module.exports = class HTTPAgent extends EventEmitter {
   constructor(opts = {}) {
     super()
 
     const { keepAlive = false, keepAliveMsecs = 1000 } = opts
-    this.options = { keepAlive, keepAliveMsecs }
 
     this._sockets = new Map()
     this._freeSockets = new Map()
@@ -47,27 +46,67 @@ module.exports = class HTTPAgent extends EventEmitter {
 
     if (this._freeSockets.has(name)) {
       const sockets = this._freeSockets.get(name)
-      socket = sockets.values().next().value
-      sockets.delete(socket)
-      if (sockets.size === 0) this._freeSockets.delete(name)
+
+      socket = sockets.pop()
+
+      if (sockets.length === 0) this._freeSockets.delete(name)
 
       this.reuseSocket(socket, req)
     } else {
+      const agent = this
+
       socket = this.createConnection(opts)
 
-      socket
-        .on('free', () => this._onfree(socket, name))
-        .on('close', () => this._onremove(socket, name))
-        .on('timeout', () => this._ontimeout(socket, name))
-    }
+      socket.on('free', onfree).on('end', onremove).on('finish', onremove).on('timeout', ontimeout)
+
+      function onfree() {
+        if (agent.keepSocketAlive(socket)) {
+          onremove(false)
+
+          const sockets = agent._freeSockets.get(name)
+
+          if (sockets === undefined) agent._freeSockets.set(name, [socket])
+          else sockets.push(socket)
+        } else {
+          socket.end()
+        }
+
+        agent.emit('free', socket)
+      }
+
+      function onremove(destroy = true) {
+        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)
+        }
+      }
+
+      function ontimeout(socket, name) {
+        const sockets = agent._freeSockets.get(name)
+        if (sockets === undefined) return
+
+        const i = sockets.indexOf(socket)
+        if (i === -1) return
 
-    let sockets = this._sockets.get(name)
-    if (sockets === undefined) {
-      sockets = new Set()
-      this._sockets.set(name, sockets)
+        const last = sockets.pop()
+        if (last !== socket) sockets[i] = last
+
+        if (sockets.length === 0) agent._freeSockets.delete(name)
+      }
     }
 
-    sockets.add(socket)
+    const sockets = this._sockets.get(name)
+
+    if (sockets === undefined) this._sockets.set(name, [socket])
+    else sockets.push(socket)
 
     req.socket = socket
 
@@ -84,41 +123,5 @@ module.exports = class HTTPAgent extends EventEmitter {
     }
   }
 
-  _onfree(socket, name) {
-    if (this.keepSocketAlive(socket)) {
-      this._onremove(socket, name, false)
-
-      let sockets = this._freeSockets.get(name)
-      if (sockets === undefined) {
-        sockets = new Set()
-        this._freeSockets.set(name, sockets)
-      }
-
-      sockets.add(socket)
-    } else {
-      socket.end()
-    }
-
-    this.emit('free', socket)
-  }
-
-  _onremove(socket, name, all = true) {
-    for (const set of all ? [this._sockets, this._freeSockets] : [this._sockets]) {
-      const sockets = set.get(name)
-      if (sockets === undefined) continue
-
-      sockets.delete(socket)
-      if (sockets.size === 0) set.delete(name)
-    }
-  }
-
-  _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/server.js

@@ -12,7 +12,9 @@ module.exports = class HTTPServer extends TCPServer {
 
     this._timeout = 0
 
-    this.on('connection', (socket) => new HTTPServerConnection(this, socket, opts))
+    this.on('connection', (socket) => {
+      new HTTPServerConnection(this, socket, opts)
+    })
 
     if (onrequest) this.on('request', onrequest)
   }
@@ -35,9 +37,11 @@ module.exports = class HTTPServer extends TCPServer {
     for (const socket of this._connections) {
       const connection = HTTPServerConnection.for(socket)
 
-      if (connection && connection.idle) {
+      if (connection === null || connection.idle) {
         socket.destroy()
       }
     }
+
+    return this
   }
 }

package/package.json

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