bare-http1 4.1.4 → 4.1.6

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)
 }
 
@@ -180,7 +180,7 @@ export interface HTTPServerConnection {
   readonly idle: boolean
 }
 
-export class HTTPServerConnection {
+class HTTPServerConnection {
   constructor(server: HTTPServer, socket: TCPSocket, opts?: HTTPServerConnectionOptions)
 
   static for(socket: TCPSocket): HTTPServerConnection
@@ -207,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)
@@ -228,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/lib/client-request.js

@@ -18,6 +18,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     const path = opts.path || '/'
     const host = (opts.host = opts.host || 'localhost')
     const port = (opts.port = opts.port || 80)
+    const headers = { host: host + (port === 80 ? '' : ':' + port), ...opts.headers }
 
     super()
 
@@ -25,7 +26,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
 
     this.method = method
     this.path = path
-    this.headers = { host: host + ':' + port, ...opts.headers }
+    this.headers = headers
 
     this._chunked = method !== 'GET' && method !== 'HEAD'
 

package/lib/server-connection.js

@@ -1,4 +1,3 @@
-const tcp = require('bare-tcp')
 const { isEnded, isFinished, getStreamError } = require('bare-stream')
 const HTTPParser = require('bare-http-parser')
 const HTTPIncomingMessage = require('./incoming-message')
@@ -77,9 +76,7 @@ module.exports = class HTTPServerConnection {
 
               this._idle = true
 
-              if (this.server._state & tcp.constants.state.CLOSING) {
-                this.socket.destroy()
-              }
+              if (this.server.closing) this.socket.destroy()
             })
 
             // Eagerly open the request stream

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)
   }
@@ -32,10 +34,10 @@ module.exports = class HTTPServer extends TCPServer {
   close(onclose) {
     super.close(onclose)
 
-    for (const socket of this._connections) {
+    for (const socket of this.connections) {
       const connection = HTTPServerConnection.for(socket)
 
-      if (connection && connection.idle) {
+      if (connection === null || connection.idle) {
         socket.destroy()
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     "./package": "./package.json",
@@ -39,7 +39,7 @@
     "bare-events": "^2.6.0",
     "bare-http-parser": "^1.0.0",
     "bare-stream": "^2.3.0",
-    "bare-tcp": "^2.0.3"
+    "bare-tcp": "^2.2.0"
   },
   "devDependencies": {
     "bare-buffer": "^3.0.2",