bare-http1 4.1.2 → 4.1.4

package/index.d.ts

@@ -8,11 +8,7 @@ import {
 } from 'bare-tcp'
 import Buffer from 'bare-buffer'
 import URL from 'bare-url'
-import constants, {
-  HTTPMethod,
-  HTTPStatusCode,
-  HTTPStatusMessage
-} from './lib/constants'
+import constants, { HTTPMethod, HTTPStatusCode, HTTPStatusMessage } from './lib/constants'
 import HTTPError from './lib/errors'
 
 export {
@@ -111,18 +107,13 @@ export interface HTTPAgent {
 
   getName(opts: { host: string; port: number }): string
 
-  addRequest(
-    req: HTTPClientRequest,
-    opts: TCPSocketOptions & TCPSocketConnectOptions
-  ): void
+  addRequest(req: HTTPClientRequest, opts: TCPSocketOptions & TCPSocketConnectOptions): void
 
   destroy(): void
 }
 
 export class HTTPAgent {
-  constructor(
-    opts?: HTTPAgentOptions & TCPSocketOptions & TCPSocketConnectOptions
-  )
+  constructor(opts?: HTTPAgentOptions & TCPSocketOptions & TCPSocketConnectOptions)
 
   static global: HTTPAgent
 }
@@ -137,8 +128,7 @@ export interface HTTPServerEvents extends TCPServerEvents {
   timeout: [socket: TCPSocket]
 }
 
-export interface HTTPServer<M extends HTTPServerEvents = HTTPServerEvents>
-  extends TCPServer<M> {
+export interface HTTPServer<M extends HTTPServerEvents = HTTPServerEvents> extends TCPServer<M> {
   readonly timeout: number | undefined
 
   setTimeout(ms: number, ontimeout?: () => void): this
@@ -150,9 +140,7 @@ export class HTTPServer {
     onrequest?: (req: HTTPIncomingMessage, res: HTTPServerResponse) => void
   )
 
-  constructor(
-    onrequest: (req: HTTPIncomingMessage, res: HTTPServerResponse) => void
-  )
+  constructor(onrequest: (req: HTTPIncomingMessage, res: HTTPServerResponse) => void)
 }
 
 export { HTTPServer as Server }
@@ -168,10 +156,7 @@ export interface HTTPServerResponse extends HTTPOutgoingMessage {
     headers?: Record<string, string | number>
   ): void
 
-  writeHead(
-    statusCode: HTTPStatusCode,
-    headers?: Record<string, string | number>
-  ): void
+  writeHead(statusCode: HTTPStatusCode, headers?: Record<string, string | number>): void
 }
 
 export class HTTPServerResponse {
@@ -191,14 +176,12 @@ export interface HTTPServerConnection {
 
   readonly req: HTTPIncomingMessage | null
   readonly res: HTTPServerResponse | null
+
+  readonly idle: boolean
 }
 
 export class HTTPServerConnection {
-  constructor(
-    server: HTTPServer,
-    socket: TCPSocket,
-    opts?: HTTPServerConnectionOptions
-  )
+  constructor(server: HTTPServer, socket: TCPSocket, opts?: HTTPServerConnectionOptions)
 
   static for(socket: TCPSocket): HTTPServerConnection
 }
@@ -217,9 +200,8 @@ export interface HTTPClientRequestOptions extends TCPSocketConnectOptions {
   path?: string
 }
 
-export interface HTTPClientRequest<
-  M extends HTTPClientRequestEvents = HTTPClientRequestEvents
-> extends HTTPOutgoingMessage<M> {
+export interface HTTPClientRequest<M extends HTTPClientRequestEvents = HTTPClientRequestEvents>
+  extends HTTPOutgoingMessage<M> {
   readonly method: HTTPMethod
   readonly path: string
   readonly headers: Record<string, string | number>
@@ -251,10 +233,7 @@ export class HTTPClientConnection {
 
   static for(socket: TCPSocket): HTTPClientConnection | null
 
-  static from(
-    socket: TCPSocket,
-    opts?: HTTPClientConnectionOptions
-  ): HTTPClientConnection
+  static from(socket: TCPSocket, opts?: HTTPClientConnectionOptions): HTTPClientConnection
 }
 
 export { HTTPClientConnection as ClientConnection }

package/index.js

@@ -40,8 +40,7 @@ exports.request = function request(url, opts, onresponse) {
 
     // For Node.js compatibility
     opts.host = opts.hostname || opts.host
-    opts.port =
-      typeof opts.port === 'string' ? parseInt(opts.port, 10) : opts.port
+    opts.port = typeof opts.port === 'string' ? parseInt(opts.port, 10) : opts.port
   }
 
   return new exports.ClientRequest(opts, onresponse)

package/lib/agent.js

@@ -1,23 +1,17 @@
+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()
 
-    this._keepAlive =
-      typeof keepAlive === 'number'
-        ? keepAlive
-        : keepAlive
-          ? keepAliveMsecs
-          : -1
+    this._keepAlive = typeof keepAlive === 'number' ? keepAlive : keepAlive ? keepAliveMsecs : -1
 
     this._opts = { ...opts }
   }
@@ -52,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
 
@@ -89,43 +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/client-connection.js

@@ -90,10 +90,7 @@ module.exports = class HTTPClientConnection {
               this.socket.emit('free')
             })
 
-            if (
-              op.headers.connection &&
-              op.headers.connection.toLowerCase() === 'upgrade'
-            ) {
+            if (op.headers.connection && op.headers.connection.toLowerCase() === 'upgrade') {
               return this._onupgrade(this._parser.end())
             }
 

package/lib/client-request.js

@@ -13,8 +13,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
 
     opts = opts ? { ...opts } : {}
 
-    const agent =
-      opts.agent === false ? new HTTPAgent() : opts.agent || HTTPAgent.global
+    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')
@@ -50,8 +49,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
       const v = this.headers[name]
 
       if (n === 'content-length') this._chunked = false
-      if (n === 'connection' && v && v.toLowerCase() === 'upgrade')
-        upgrade = true
+      if (n === 'connection' && v && v.toLowerCase() === 'upgrade') upgrade = true
 
       h += `${httpCase(n)}: ${v}\r\n`
     }

package/lib/server-connection.js

@@ -18,10 +18,7 @@ module.exports = class HTTPServerConnection {
   }
 
   constructor(server, socket, opts = {}) {
-    const {
-      IncomingMessage = HTTPIncomingMessage,
-      ServerResponse = HTTPServerResponse
-    } = opts
+    const { IncomingMessage = HTTPIncomingMessage, ServerResponse = HTTPServerResponse } = opts
 
     this.server = server
     this.socket = socket
@@ -89,10 +86,7 @@ module.exports = class HTTPServerConnection {
             this.req.resume()
             this.req.pause()
 
-            if (
-              op.headers.connection &&
-              op.headers.connection.toLowerCase() === 'upgrade'
-            ) {
+            if (op.headers.connection && op.headers.connection.toLowerCase() === 'upgrade') {
               return this._onupgrade(this._parser.end())
             }
 

package/lib/server-response.js

@@ -42,9 +42,7 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
       'HTTP/1.1 ' +
       this.statusCode +
       ' ' +
-      (this.statusMessage === null
-        ? constants.status[this.statusCode]
-        : this.statusMessage) +
+      (this.statusMessage === null ? constants.status[this.statusCode] : this.statusMessage) +
       '\r\n'
 
     for (const name of Object.keys(this.headers)) {
@@ -52,8 +50,7 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
       const v = this.headers[name]
 
       if (n === 'content-length') this._chunked = false
-      if (n === 'connection' && v && v.toLowerCase() === 'close')
-        this._close = true
+      if (n === 'connection' && v && v.toLowerCase() === 'close') this._close = true
 
       h += httpCase(n) + ': ' + v + '\r\n'
     }

package/lib/server.js

@@ -12,10 +12,7 @@ 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)
   }
@@ -42,5 +39,7 @@ module.exports = class HTTPServer extends TCPServer {
         socket.destroy()
       }
     }
+
+    return this
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     "./package": "./package.json",
@@ -46,7 +46,7 @@
     "bare-url": "^2.1.3",
     "brittle": "^3.3.0",
     "prettier": "^3.4.1",
-    "prettier-config-standard": "^7.0.0"
+    "prettier-config-holepunch": "^2.0.0"
   },
   "peerDependencies": {
     "bare-buffer": "*",