bare-http1 3.8.1 → 4.0.0

package/index.js

@@ -1,25 +1,25 @@
 exports.IncomingMessage = require('./lib/incoming-message')
 exports.OutgoingMessage = require('./lib/outgoing-message')
 
-const Agent = exports.Agent = require('./lib/agent')
-exports.globalAgent = Agent.global
+exports.Agent = require('./lib/agent')
+exports.globalAgent = exports.Agent.global
 
-const Server = exports.Server = require('./lib/server')
+exports.Server = require('./lib/server')
 exports.ServerResponse = require('./lib/server-response')
 exports.ServerConnection = require('./lib/server-connection')
 
-const Request = exports.ClientRequest = require('./lib/client-request')
+exports.ClientRequest = require('./lib/client-request')
 exports.ClientConnection = require('./lib/client-connection')
 
 exports.constants = require('./lib/constants')
 
 exports.STATUS_CODES = exports.constants.status // For Node.js compatibility
 
-exports.createServer = function createServer (opts, onrequest) {
-  return new Server(opts, onrequest)
+exports.createServer = function createServer(opts, onrequest) {
+  return new exports.Server(opts, onrequest)
 }
 
-exports.request = function request (url, opts, onresponse) {
+exports.request = function request(url, opts, onresponse) {
   if (typeof opts === 'function') {
     onresponse = opts
     opts = {}
@@ -38,27 +38,31 @@ 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 Request(opts, onresponse)
+  return new exports.ClientRequest(opts, onresponse)
 }
 
 // https://url.spec.whatwg.org/#default-port
-function defaultPort (url) {
+function defaultPort(url) {
   switch (url.protocol) {
-    case 'ftp:': return 21
+    case 'ftp:':
+      return 21
     case 'http:':
-    case 'ws:': return 80
+    case 'ws:':
+      return 80
     case 'https:':
-    case 'wss:': return 443
+    case 'wss:':
+      return 443
   }
 
   return null
 }
 
 // https://url.spec.whatwg.org/#api
-function isURL (url) {
+function isURL(url) {
   return (
     url !== null &&
     typeof url === 'object' &&

package/lib/agent.js

@@ -2,29 +2,31 @@ const tcp = require('bare-tcp')
 const HTTPClientConnection = require('./client-connection')
 
 module.exports = class HTTPAgent {
-  constructor (opts = {}) {
-    const {
-      keepAlive = false,
-      keepAliveMsecs = 1000
-    } = opts
+  constructor(opts = {}) {
+    const { keepAlive = false, keepAliveMsecs = 1000 } = opts
 
     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 }
   }
 
-  createConnection (opts) {
+  createConnection(opts) {
     return tcp.createConnection(opts)
   }
 
-  reuseSocket (socket, req) {
+  reuseSocket(socket, req) {
     socket.ref()
   }
 
-  keepSocketAlive (socket) {
+  keepSocketAlive(socket) {
     if (this._keepAlive === -1) return false
 
     socket.setKeepAlive(true, this._keepAlive)
@@ -33,11 +35,11 @@ module.exports = class HTTPAgent {
     return true
   }
 
-  getName (opts) {
+  getName(opts) {
     return `${opts.host}:${opts.port}`
   }
 
-  addRequest (req, opts) {
+  addRequest(req, opts) {
     opts = { ...opts, ...this._opts }
 
     const name = this.getName(opts)
@@ -75,7 +77,7 @@ module.exports = class HTTPAgent {
     connection.req = req
   }
 
-  destroy () {
+  destroy() {
     for (const set of [this._sockets, this._freeSockets]) {
       for (const [, sockets] of set) {
         for (const socket of sockets) socket.destroy()
@@ -83,7 +85,7 @@ module.exports = class HTTPAgent {
     }
   }
 
-  _onfree (socket, name) {
+  _onfree(socket, name) {
     if (this.keepSocketAlive(socket)) {
       this._onremove(socket, name, false)
 
@@ -99,8 +101,10 @@ module.exports = class HTTPAgent {
     }
   }
 
-  _onremove (socket, name, all = true) {
-    for (const set of all ? [this._sockets, this._freeSockets] : [this._sockets]) {
+  _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
 
@@ -109,7 +113,7 @@ module.exports = class HTTPAgent {
     }
   }
 
-  _ontimeout (socket, name) {
+  _ontimeout(socket, name) {
     const sockets = this._freeSockets.get(name)
     if (!sockets) return
 

package/lib/client-connection.js

@@ -7,18 +7,16 @@ const empty = Buffer.alloc(0)
 module.exports = class HTTPClientConnection {
   static _connections = new WeakMap()
 
-  static for (socket) {
+  static for(socket) {
     return this._connections.get(socket) || null
   }
 
-  static from (socket, opts) {
+  static from(socket, opts) {
     return this.for(socket) || new this(socket, opts)
   }
 
-  constructor (socket, opts = {}) {
-    const {
-      IncomingMessage = HTTPIncomingMessage
-    } = opts
+  constructor(socket, opts = {}) {
+    const { IncomingMessage = HTTPIncomingMessage } = opts
 
     this.socket = socket
 
@@ -51,23 +49,23 @@ module.exports = class HTTPClientConnection {
     HTTPClientConnection._connections.set(socket, this)
   }
 
-  get idle () {
+  get idle() {
     return this._idle
   }
 
-  _onerror (err) {
+  _onerror(err) {
     if (this.req) this.req.destroy(err)
   }
 
-  _onclose () {
+  _onclose() {
     if (this.req) this.req._continueFinal()
   }
 
-  _onend () {
+  _onend() {
     if (this.req) this.req.destroy(errors.CONNECTION_LOST())
   }
 
-  _ondata (data) {
+  _ondata(data) {
     this._idle = false
 
     if (this._state === constants.state.IN_BODY) return this._onbody(data)
@@ -90,7 +88,10 @@ module.exports = class HTTPClientConnection {
 
         if (this._state === constants.state.BEFORE_CHUNK) {
           const head = this._buffer.subarray(0, i - 1)
-          this._buffer = i + 1 === this._buffer.byteLength ? null : this._buffer.subarray(i + 1)
+          this._buffer =
+            i + 1 === this._buffer.byteLength
+              ? null
+              : this._buffer.subarray(i + 1)
           i = 0
           hits = 0
           this._onchunklength(head)
@@ -104,7 +105,10 @@ module.exports = class HTTPClientConnection {
             continue
           }
 
-          this._buffer = i + 1 === this._buffer.byteLength ? null : this._buffer.subarray(i + 1)
+          this._buffer =
+            i + 1 === this._buffer.byteLength
+              ? null
+              : this._buffer.subarray(i + 1)
           i = 0
           hits = 0
           this._onchunk(chunk)
@@ -116,7 +120,10 @@ module.exports = class HTTPClientConnection {
       } else if (hits === 3 && b === 10) {
         if (this._state === constants.state.BEFORE_HEAD) {
           const head = this._buffer.subarray(0, i - 3)
-          this._buffer = i + 1 === this._buffer.byteLength ? null : this._buffer.subarray(i + 1)
+          this._buffer =
+            i + 1 === this._buffer.byteLength
+              ? null
+              : this._buffer.subarray(i + 1)
           i = 0
           hits = 0
           this._onhead(head)
@@ -129,7 +136,7 @@ module.exports = class HTTPClientConnection {
     }
   }
 
-  _onhead (data) {
+  _onhead(data) {
     this._state = constants.state.IN_HEAD
 
     const r = data.toString().split('\r\n')
@@ -145,11 +152,19 @@ module.exports = class HTTPClientConnection {
       headers[name.toLowerCase()] = value
     }
 
-    this.req.on('close', () => { this.req = null })
+    this.req.on('close', () => {
+      this.req = null
+    })
 
-    this.res = new this._IncomingMessage(this.socket, headers, { statusCode: parseInt(statusCode, 10), statusMessage: statusMessage.join(' ') })
+    this.res = new this._IncomingMessage(this.socket, headers, {
+      statusCode: parseInt(statusCode, 10),
+      statusMessage: statusMessage.join(' ')
+    })
 
-    this.res.on('close', () => { this.res = null; this._onreset() })
+    this.res.on('close', () => {
+      this.res = null
+      this._onreset()
+    })
 
     if (headers.connection && headers.connection.toLowerCase() === 'upgrade') {
       const head = this._buffer
@@ -176,14 +191,14 @@ module.exports = class HTTPClientConnection {
     }
   }
 
-  _onchunklength (data) {
+  _onchunklength(data) {
     this._length = parseInt(data.toString(), 16)
 
     if (this._length === 0) this._onfinished()
     else this._state = constants.state.IN_CHUNK
   }
 
-  _onchunk (data) {
+  _onchunk(data) {
     this._read += data.byteLength
 
     this.res.push(data)
@@ -191,7 +206,7 @@ module.exports = class HTTPClientConnection {
     this._state = constants.state.BEFORE_CHUNK
   }
 
-  _onbody (data) {
+  _onbody(data) {
     this._read += data.byteLength
 
     this.res.push(data)
@@ -199,7 +214,7 @@ module.exports = class HTTPClientConnection {
     if (this._read === this._length) this._onfinished()
   }
 
-  _onupgrade (head) {
+  _onupgrade(head) {
     this._ondetach()
 
     const req = this.req
@@ -212,16 +227,16 @@ module.exports = class HTTPClientConnection {
     this.socket.destroy()
   }
 
-  _ontimeout () {
+  _ontimeout() {
     if (this.req) this.req.emit('timeout')
   }
 
-  _onfinished () {
+  _onfinished() {
     if (this.res) this.res.push(null)
     if (this.req) this.req._continueFinal()
   }
 
-  _onreset () {
+  _onreset() {
     this._state = constants.state.BEFORE_HEAD
     this._length = -1
     this._read = 0
@@ -231,11 +246,11 @@ module.exports = class HTTPClientConnection {
     this.socket.emit('free')
   }
 
-  _ondrain () {
+  _ondrain() {
     if (this.req) this.req._continueWrite()
   }
 
-  _ondetach () {
+  _ondetach() {
     this.socket
       .off('error', this._onerror)
       .off('close', this._onclose)

package/lib/client-request.js

@@ -2,7 +2,7 @@ const HTTPAgent = require('./agent')
 const HTTPOutgoingMessage = require('./outgoing-message')
 
 module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
-  constructor (opts = {}, onresponse = null) {
+  constructor(opts = {}, onresponse = null) {
     if (typeof opts === 'function') {
       onresponse = opts
       opts = {}
@@ -10,11 +10,12 @@ 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'
-    const port = opts.port = opts.port || 80
+    const host = (opts.host = opts.host || 'localhost')
+    const port = (opts.port = opts.port || 80)
 
     super()
 
@@ -31,7 +32,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     if (onresponse) this.once('response', onresponse)
   }
 
-  _header () {
+  _header() {
     let h = `${this.method} ${this.path} HTTP/1.1\r\n`
 
     let upgrade = false
@@ -41,7 +42,8 @@ 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`
     }
@@ -55,7 +57,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     return h
   }
 
-  _write (data, encoding, cb) {
+  _write(data, encoding, cb) {
     if (this.headersSent === false) this.flushHeaders()
 
     if (this._chunked) {
@@ -70,7 +72,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     else this._pendingWrite = cb
   }
 
-  _final (cb) {
+  _final(cb) {
     if (this.headersSent === false) this.flushHeaders()
 
     if (this._chunked) this.socket.write(Buffer.from('0\r\n\r\n'))
@@ -78,20 +80,20 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     this._pendingFinal = cb
   }
 
-  _predestroy () {
+  _predestroy() {
     if (this.upgrade) return this._continueFinal()
 
     this.socket.destroy()
   }
 
-  _continueWrite () {
+  _continueWrite() {
     if (this._pendingWrite === null) return
     const cb = this._pendingWrite
     this._pendingWrite = null
     cb(null)
   }
 
-  _continueFinal () {
+  _continueFinal() {
     if (this._pendingFinal === null) return
     const cb = this._pendingFinal
     this._pendingFinal = null
@@ -99,7 +101,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
   }
 }
 
-function httpCase (n) {
+function httpCase(n) {
   let s = ''
   for (const part of n.split('-')) {
     s += (s ? '-' : '') + part.slice(0, 1).toUpperCase() + part.slice(1)

package/lib/errors.js

@@ -1,5 +1,5 @@
 module.exports = class HTTPError extends Error {
-  constructor (msg, code, fn = HTTPError) {
+  constructor(msg, code, fn = HTTPError) {
     super(`${code}: ${msg}`)
     this.code = code
 
@@ -8,15 +8,15 @@ module.exports = class HTTPError extends Error {
     }
   }
 
-  get name () {
+  get name() {
     return 'HTTPError'
   }
 
-  static NOT_IMPLEMENTED (msg = 'Method not implemented') {
+  static NOT_IMPLEMENTED(msg = 'Method not implemented') {
     return new HTTPError(msg, 'NOT_IMPLEMENTED', HTTPError.NOT_IMPLEMENTED)
   }
 
-  static CONNECTION_LOST (msg = 'Socket hung up') {
+  static CONNECTION_LOST(msg = 'Socket hung up') {
     return new HTTPError(msg, 'CONNECTION_LOST', HTTPError.CONNECTION_LOST)
   }
 }

package/lib/incoming-message.js

@@ -1,7 +1,7 @@
 const { Readable } = require('bare-stream')
 
 module.exports = class HTTPIncomingMessage extends Readable {
-  constructor (socket = null, headers = {}, opts = {}) {
+  constructor(socket = null, headers = {}, opts = {}) {
     super()
 
     this.socket = socket
@@ -17,23 +17,23 @@ module.exports = class HTTPIncomingMessage extends Readable {
     this.statusMessage = opts.statusMessage || ''
   }
 
-  get httpVersion () {
+  get httpVersion() {
     return '1.1'
   }
 
-  getHeader (name) {
+  getHeader(name) {
     return this.headers[name.toLowerCase()]
   }
 
-  getHeaders () {
+  getHeaders() {
     return { ...this.headers }
   }
 
-  hasHeader (name) {
+  hasHeader(name) {
     return name.toLowerCase() in this.headers
   }
 
-  setTimeout (ms, ontimeout) {
+  setTimeout(ms, ontimeout) {
     if (ontimeout) this.once('timeout', ontimeout)
 
     this.socket.setTimeout(ms)
@@ -41,7 +41,7 @@ module.exports = class HTTPIncomingMessage extends Readable {
     return this
   }
 
-  _predestroy () {
+  _predestroy() {
     if (this.upgrade === false && this.socket !== null) this.socket.destroy()
   }
 }

package/lib/outgoing-message.js

@@ -2,7 +2,7 @@ const { Writable } = require('bare-stream')
 const errors = require('./errors')
 
 module.exports = class HTTPOutgoingMessage extends Writable {
-  constructor (socket = null) {
+  constructor(socket = null) {
     super()
 
     this.socket = socket
@@ -11,30 +11,30 @@ module.exports = class HTTPOutgoingMessage extends Writable {
     this.upgrade = false
   }
 
-  getHeader (name) {
+  getHeader(name) {
     return this.headers[name.toLowerCase()]
   }
 
-  getHeaders () {
+  getHeaders() {
     return { ...this.headers }
   }
 
-  hasHeader (name) {
+  hasHeader(name) {
     return name.toLowerCase() in this.headers
   }
 
-  setHeader (name, value) {
+  setHeader(name, value) {
     this.headers[name.toLowerCase()] = value
   }
 
-  flushHeaders () {
+  flushHeaders() {
     if (this.headersSent === true || this.socket === null) return
 
     this.socket.write(Buffer.from(this._header()))
     this.headersSent = true
   }
 
-  setTimeout (ms, ontimeout) {
+  setTimeout(ms, ontimeout) {
     if (ontimeout) this.once('timeout', ontimeout)
 
     this.socket.setTimeout(ms)
@@ -42,11 +42,11 @@ module.exports = class HTTPOutgoingMessage extends Writable {
     return this
   }
 
-  _header () {
+  _header() {
     throw errors.NOT_IMPLEMENTED()
   }
 
-  _predestroy () {
+  _predestroy() {
     if (this.upgrade === false && this.socket !== null) this.socket.destroy()
   }
 }

package/lib/server-connection.js

@@ -1,4 +1,5 @@
 const tcp = require('bare-tcp')
+const { isEnded, isFinished, getStreamError } = require('bare-stream')
 const HTTPIncomingMessage = require('./incoming-message')
 const HTTPServerResponse = require('./server-response')
 const constants = require('./constants')
@@ -8,11 +9,11 @@ const empty = Buffer.alloc(0)
 module.exports = class HTTPServerConnection {
   static _connections = new WeakMap()
 
-  static for (socket) {
+  static for(socket) {
     return this._connections.get(socket) || null
   }
 
-  constructor (server, socket, opts = {}) {
+  constructor(server, socket, opts = {}) {
     const {
       IncomingMessage = HTTPIncomingMessage,
       ServerResponse = HTTPServerResponse
@@ -33,13 +34,14 @@ module.exports = class HTTPServerConnection {
     this._buffer = null
     this._idle = true
 
-    this._onerror = this._onerror.bind(this)
+    this._onclose = this._onclose.bind(this)
     this._ondata = this._ondata.bind(this)
     this._ondrain = this._ondrain.bind(this)
     this._ontimeout = this._ontimeout.bind(this)
 
     socket
-      .on('error', this._onerror)
+      .on('error', noop)
+      .on('close', this._onclose)
       .on('data', this._ondata)
       .on('drain', this._ondrain)
       .on('timeout', this._ontimeout)
@@ -49,15 +51,18 @@ module.exports = class HTTPServerConnection {
     if (this.server.timeout) socket.setTimeout(this.server.timeout)
   }
 
-  get idle () {
+  get idle() {
     return this._idle
   }
 
-  _onerror (err) {
-    this.socket.destroy(err)
+  _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)
   }
 
-  _ondata (data) {
+  _ondata(data) {
     this._idle = false
 
     if (this._state === constants.state.IN_BODY) return this._onbody(data)
@@ -80,7 +85,10 @@ module.exports = class HTTPServerConnection {
 
         if (this._state === constants.state.BEFORE_CHUNK) {
           const head = this._buffer.subarray(0, i - 1)
-          this._buffer = i + 1 === this._buffer.byteLength ? null : this._buffer.subarray(i + 1)
+          this._buffer =
+            i + 1 === this._buffer.byteLength
+              ? null
+              : this._buffer.subarray(i + 1)
           i = 0
           hits = 0
           this._onchunklength(head)
@@ -94,7 +102,10 @@ module.exports = class HTTPServerConnection {
             continue
           }
 
-          this._buffer = i + 1 === this._buffer.byteLength ? null : this._buffer.subarray(i + 1)
+          this._buffer =
+            i + 1 === this._buffer.byteLength
+              ? null
+              : this._buffer.subarray(i + 1)
           i = 0
           hits = 0
           this._onchunk(chunk)
@@ -106,7 +117,10 @@ module.exports = class HTTPServerConnection {
       } else if (hits === 3 && b === 10) {
         if (this._state === constants.state.BEFORE_HEAD) {
           const head = this._buffer.subarray(0, i - 3)
-          this._buffer = i + 1 === this._buffer.byteLength ? null : this._buffer.subarray(i + 1)
+          this._buffer =
+            i + 1 === this._buffer.byteLength
+              ? null
+              : this._buffer.subarray(i + 1)
           i = 0
           hits = 0
           this._onhead(head)
@@ -119,7 +133,7 @@ module.exports = class HTTPServerConnection {
     }
   }
 
-  _onhead (data) {
+  _onhead(data) {
     this._state = constants.state.IN_HEAD
 
     const r = data.toString().split('\r\n')
@@ -137,7 +151,10 @@ module.exports = class HTTPServerConnection {
 
     this.req = new this._IncomingMessage(this.socket, headers, { method, url })
 
-    this.req.on('close', () => { this.req = null; this._onreset() })
+    this.req.on('close', () => {
+      this.req = null
+      this._onreset()
+    })
 
     if (headers.connection && headers.connection.toLowerCase() === 'upgrade') {
       const head = this._buffer
@@ -145,9 +162,15 @@ module.exports = class HTTPServerConnection {
       return this._onupgrade(head)
     }
 
-    this.res = new this._ServerResponse(this.socket, this.req, headers.connection === 'close')
+    this.res = new this._ServerResponse(
+      this.socket,
+      this.req,
+      headers.connection === 'close'
+    )
 
-    this.res.on('close', () => { this.res = null })
+    this.res.on('close', () => {
+      this.res = null
+    })
 
     this.server.emit('request', this.req, this.res)
 
@@ -168,14 +191,14 @@ module.exports = class HTTPServerConnection {
     }
   }
 
-  _onchunklength (data) {
+  _onchunklength(data) {
     this._length = parseInt(data.toString(), 16)
 
     if (this._length === 0) this._onfinished()
     else this._state = constants.state.IN_CHUNK
   }
 
-  _onchunk (data) {
+  _onchunk(data) {
     this._read += data.byteLength
 
     this.req.push(data)
@@ -183,7 +206,7 @@ module.exports = class HTTPServerConnection {
     this._state = constants.state.BEFORE_CHUNK
   }
 
-  _onbody (data) {
+  _onbody(data) {
     this._read += data.byteLength
 
     this.req.push(data)
@@ -191,7 +214,7 @@ module.exports = class HTTPServerConnection {
     if (this._read === this._length) this._onfinished()
   }
 
-  _onupgrade (head) {
+  _onupgrade(head) {
     this._ondetach()
 
     const req = this.req
@@ -202,7 +225,7 @@ module.exports = class HTTPServerConnection {
     this.server.emit('upgrade', req, this.socket, head || empty)
   }
 
-  _ontimeout () {
+  _ontimeout() {
     const reqTimeout = this.req && this.req.emit('timeout')
     const resTimeout = this.res && this.res.emit('timeout')
     const serverTimeout = this.server.emit('timeout', this.socket)
@@ -210,11 +233,11 @@ module.exports = class HTTPServerConnection {
     if (!reqTimeout && !resTimeout && !serverTimeout) this.socket.destroy()
   }
 
-  _onfinished () {
+  _onfinished() {
     if (this.req) this.req.push(null)
   }
 
-  _onreset () {
+  _onreset() {
     this._state = constants.state.BEFORE_HEAD
     this._length = -1
     this._read = 0
@@ -226,13 +249,14 @@ module.exports = class HTTPServerConnection {
     }
   }
 
-  _ondrain () {
+  _ondrain() {
     if (this.res) this.res._continueWrite()
   }
 
-  _ondetach () {
+  _ondetach() {
     this.socket
-      .off('error', this._onerror)
+      .off('error', noop)
+      .off('close', this._onclose)
       .off('data', this._ondata)
       .off('drain', this._ondrain)
       .off('timeout', this._ontimeout)
@@ -240,3 +264,5 @@ module.exports = class HTTPServerConnection {
     HTTPServerConnection._connections.delete(this.socket)
   }
 }
+
+function noop() {}

package/lib/server-response.js

@@ -2,7 +2,7 @@ const HTTPOutgoingMessage = require('./outgoing-message')
 const constants = require('./constants')
 
 module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
-  constructor (socket, req, close) {
+  constructor(socket, req, close) {
     super(socket)
 
     this.req = req
@@ -18,12 +18,12 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
     this._pendingWrite = null
   }
 
-  end (data) {
+  end(data) {
     this._finishing = true
     return super.end(data)
   }
 
-  writeHead (statusCode, statusMessage = null, headers = {}) {
+  writeHead(statusCode, statusMessage = null, headers = {}) {
     if (typeof statusMessage === 'object' && statusMessage !== null) {
       headers = statusMessage
       statusMessage = null
@@ -34,15 +34,23 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
     this.headers = headers || {}
   }
 
-  _header () {
-    let h = 'HTTP/1.1 ' + this.statusCode + ' ' + (this.statusMessage === null ? constants.status[this.statusCode] : this.statusMessage) + '\r\n'
+  _header() {
+    let h =
+      'HTTP/1.1 ' +
+      this.statusCode +
+      ' ' +
+      (this.statusMessage === null
+        ? constants.status[this.statusCode]
+        : this.statusMessage) +
+      '\r\n'
 
     for (const name of Object.keys(this.headers)) {
       const n = name.toLowerCase()
       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'
     }
@@ -54,10 +62,13 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
     return h
   }
 
-  _write (data, encoding, cb) {
+  _write(data, encoding, cb) {
     if (this.headersSent === false) {
       if (this._finishing) {
-        this.setHeader('Content-Length', (data.byteLength + this._writableState.buffered).toString())
+        this.setHeader(
+          'Content-Length',
+          (data.byteLength + this._writableState.buffered).toString()
+        )
       }
 
       this.flushHeaders()
@@ -77,25 +88,26 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
     else this._pendingWrite = cb
   }
 
-  _final (cb) {
+  _final(cb) {
     if (this.headersSent === false) {
       this.setHeader('Content-Length', '0')
       this.flushHeaders()
     }
 
-    if (this._chunked && this._onlyHeaders === false) this.socket.write(Buffer.from('0\r\n\r\n'))
+    if (this._chunked && this._onlyHeaders === false)
+      this.socket.write(Buffer.from('0\r\n\r\n'))
     if (this._close) this.socket.end()
 
     cb(null)
   }
 
-  _predestroy () {
+  _predestroy() {
     super._predestroy()
     this.req.destroy()
     this._continueWrite()
   }
 
-  _continueWrite () {
+  _continueWrite() {
     if (this._pendingWrite === null) return
     const cb = this._pendingWrite
     this._pendingWrite = null
@@ -103,7 +115,7 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
   }
 }
 
-function httpCase (n) {
+function httpCase(n) {
   let s = ''
   for (const part of n.split('-')) {
     s += (s ? '-' : '') + part.slice(0, 1).toUpperCase() + part.slice(1)

package/lib/server.js

@@ -2,7 +2,7 @@ const TCPServer = require('bare-tcp').Server
 const HTTPServerConnection = require('./server-connection')
 
 module.exports = class HTTPServer extends TCPServer {
-  constructor (opts = {}, onrequest) {
+  constructor(opts = {}, onrequest) {
     if (typeof opts === 'function') {
       onrequest = opts
       opts = {}
@@ -12,16 +12,19 @@ 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)
   }
 
-  get timeout () {
+  get timeout() {
     return this._timeout || undefined // For Node.js compatibility
   }
 
-  setTimeout (ms = 0, ontimeout) {
+  setTimeout(ms = 0, ontimeout) {
     if (ontimeout) this.on('timeout', ontimeout)
 
     this._timeout = ms
@@ -29,7 +32,7 @@ module.exports = class HTTPServer extends TCPServer {
     return this
   }
 
-  close (onclose) {
+  close(onclose) {
     super.close(onclose)
 
     for (const socket of this._connections) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "3.8.1",
+  "version": "4.0.0",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -12,7 +12,7 @@
     "lib"
   ],
   "scripts": {
-    "test": "standard && bare test.js"
+    "test": "prettier . --check && bare test.js"
   },
   "repository": {
     "type": "git",
@@ -26,11 +26,12 @@
   "homepage": "https://github.com/holepunchto/bare-http1#readme",
   "dependencies": {
     "bare-events": "^2.0.0",
-    "bare-stream": "^2.0.0",
-    "bare-tcp": "^1.8.0"
+    "bare-stream": "^2.3.0",
+    "bare-tcp": "^2.0.0"
   },
   "devDependencies": {
     "brittle": "^3.3.0",
-    "standard": "^17.0.0"
+    "prettier": "^3.4.1",
+    "prettier-config-standard": "^7.0.0"
   }
 }