bare-http1 4.4.0 → 4.5.2

package/index.d.ts

@@ -99,6 +99,8 @@ export interface HTTPAgentOptions {
 }
 
 export interface HTTPAgent {
+  readonly suspended: boolean
+  readonly resumed: Promise<void> | null
   readonly sockets: IterableIterator<TCPSocket>
   readonly freeSockets: IterableIterator<TCPSocket>
 
@@ -112,6 +114,8 @@ export interface HTTPAgent {
 
   addRequest(req: HTTPClientRequest, opts: TCPSocketOptions & TCPSocketConnectOptions): void
 
+  suspend(): void
+  resume(): void
   destroy(): void
 }
 
@@ -175,7 +179,7 @@ export interface HTTPServerConnectionOptions {
 
 export interface HTTPServerConnection {
   readonly server: HTTPServer
-  readonly socket: TCPSocket
+  readonly socket: TCPSocket | null
 
   readonly req: HTTPIncomingMessage | null
   readonly res: HTTPServerResponse | null
@@ -224,7 +228,7 @@ export interface HTTPClientConnectionOptions {
 }
 
 export interface HTTPClientConnection {
-  readonly socket: TCPSocket
+  readonly socket: TCPSocket | null
 
   readonly req: HTTPClientRequest | null
   readonly res: HTTPIncomingMessage | null

package/lib/agent.js

@@ -1,6 +1,7 @@
 const EventEmitter = require('bare-events')
 const tcp = require('bare-tcp')
 const HTTPClientConnection = require('./client-connection')
+const errors = require('./errors')
 
 class HTTPSocketSet {
   constructor() {
@@ -68,6 +69,9 @@ class HTTPAgent extends EventEmitter {
 
     const { keepAlive = false, keepAliveMsecs = 1000, defaultPort = 80 } = opts
 
+    this._suspended = false
+    this._resuming = null
+
     this._sockets = new HTTPSocketSet()
     this._freeSockets = new HTTPSocketSet()
 
@@ -77,6 +81,14 @@ class HTTPAgent extends EventEmitter {
     this._opts = { ...opts }
   }
 
+  get suspended() {
+    return this._suspended
+  }
+
+  get resumed() {
+    return this._resuming ? this._resuming.promise : null
+  }
+
   get sockets() {
     return this._sockets.sockets()
   }
@@ -90,6 +102,8 @@ class HTTPAgent extends EventEmitter {
   }
 
   createConnection(opts) {
+    if (this._suspended) throw errors.AGENT_SUSPENDED()
+
     return tcp.createConnection(opts)
   }
 
@@ -169,6 +183,23 @@ class HTTPAgent extends EventEmitter {
     connection._req = req
   }
 
+  suspend() {
+    if (this._suspended) return
+
+    this._resuming = Promise.withResolvers()
+    this._suspended = true
+
+    this.destroy()
+  }
+
+  resume() {
+    if (this._resuming === null) return
+
+    this._resuming.resolve()
+    this._resuming = null
+    this._suspended = false
+  }
+
   destroy() {
     for (const socket of this._sockets.sockets()) socket.destroy()
   }
@@ -177,7 +208,7 @@ class HTTPAgent extends EventEmitter {
 
   static _onidle() {
     for (const agent of this._agents) {
-      for (const socket of agent._sockets.sockets()) socket.destroy()
+      agent.destroy()
     }
   }
 }

package/lib/client-connection.js

@@ -71,7 +71,7 @@ module.exports = class HTTPClientConnection {
   }
 
   _onclose() {
-    if (this._req) this._req._continueFinal()
+    if (this._req) this._req.destroy()
   }
 
   _onend() {
@@ -113,8 +113,15 @@ module.exports = class HTTPClientConnection {
             break
 
           case END:
-            if (this._res) this._res.push(null)
-            if (this._req) this._req._continueFinal()
+            if (this._res) {
+              this._res._socket = null
+              this._res.push(null)
+            }
+
+            if (this._req) {
+              this._req._socket = null
+              this._req.destroy()
+            }
             break
         }
       }
@@ -134,7 +141,7 @@ module.exports = class HTTPClientConnection {
     const upgraded = req.emit('upgrade', res, this._socket, data || EMPTY)
 
     res.push(null)
-    req._continueFinal()
+    req.destroy()
 
     if (!upgraded) this._socket.destroy()
   }

package/lib/errors.d.ts

@@ -1,8 +1,5 @@
 declare class HTTPError extends Error {
-  private constructor()
-
-  static NOT_IMPLEMENTED(msg?: string): HTTPError
-  static CONNECTION_LOST(msg?: string): HTTPError
+  readonly code: string
 }
 
 export = HTTPError

package/lib/errors.js

@@ -19,4 +19,8 @@ module.exports = class HTTPError extends Error {
   static CONNECTION_LOST(msg = 'Socket hung up') {
     return new HTTPError(msg, HTTPError.CONNECTION_LOST)
   }
+
+  static AGENT_SUSPENDED(msg = 'Agent is suspended') {
+    return new HTTPError(msg, HTTPError.AGENT_SUSPENDED)
+  }
 }

package/lib/server-connection.js

@@ -71,6 +71,7 @@ module.exports = class HTTPServerConnection {
   _onclose() {
     if (this._req && !isEnded(this._req)) this._req.destroy()
     if (this._res && !isFinished(this._res)) this._res.destroy()
+
     const err = getStreamError(this._socket)
     if (err) this._socket.destroy(err)
   }
@@ -121,7 +122,10 @@ module.exports = class HTTPServerConnection {
             break
 
           case END:
-            if (this._req) this._req.push(null)
+            if (this._req) {
+              this._req._socket = null
+              this._req.push(null)
+            }
             break
         }
       }

package/lib/server-response.js

@@ -109,9 +109,7 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
       this.flushHeaders()
     }
 
-    if (this._chunked && this._onlyHeaders === false) {
-      this._socket.write(CHUNK_TERMINATOR)
-    }
+    if (this._chunked && this._onlyHeaders === false) this._socket.write(CHUNK_TERMINATOR)
 
     if (this._close) this._socket.end()
 
@@ -122,6 +120,7 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
     super._predestroy()
 
     this._req.destroy()
+
     this._continueWrite()
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "4.4.0",
+  "version": "4.5.2",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     "./package": "./package.json",
@@ -37,7 +37,7 @@
   "homepage": "https://github.com/holepunchto/bare-http1#readme",
   "dependencies": {
     "bare-events": "^2.6.0",
-    "bare-http-parser": "^1.0.0",
+    "bare-http-parser": "^1.1.1",
     "bare-stream": "^2.3.0",
     "bare-tcp": "^2.2.0"
   },