bare-http1 4.1.0 → 4.1.2

package/index.d.ts

@@ -191,8 +191,6 @@ export interface HTTPServerConnection {
 
   readonly req: HTTPIncomingMessage | null
   readonly res: HTTPServerResponse | null
-
-  readonly idle: boolean
 }
 
 export class HTTPServerConnection {

package/lib/client-connection.js

@@ -1,8 +1,12 @@
+const HTTPParser = require('bare-http-parser')
 const HTTPIncomingMessage = require('./incoming-message')
-const constants = require('./constants')
 const errors = require('./errors')
 
-const empty = Buffer.alloc(0)
+const {
+  constants: { RESPONSE, DATA, END }
+} = HTTPParser
+
+const EMPTY = Buffer.alloc(0)
 
 module.exports = class HTTPClientConnection {
   static _connections = new WeakMap()
@@ -25,10 +29,7 @@ module.exports = class HTTPClientConnection {
 
     this._IncomingMessage = IncomingMessage
 
-    this._state = constants.state.BEFORE_HEAD
-    this._length = -1
-    this._read = 0
-    this._buffer = null
+    this._parser = new HTTPParser()
     this._idle = true
 
     this._onerror = this._onerror.bind(this)
@@ -68,154 +69,53 @@ module.exports = class HTTPClientConnection {
   _ondata(data) {
     this._idle = false
 
-    if (this._state === constants.state.IN_BODY) return this._onbody(data)
-
-    if (this._buffer !== null) {
-      this._buffer = Buffer.concat([this._buffer, data])
-    } else {
-      this._buffer = data
-    }
-
-    let hits = 0
-
-    for (let i = 0; i < this._buffer.byteLength; i++) {
-      const b = this._buffer[i]
-
-      if (hits === 0 && b === 13) {
-        hits++
-      } else if (hits === 1 && b === 10) {
-        hits++
-
-        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)
-          i = 0
-          hits = 0
-          this._onchunklength(head)
-
-          if (this._buffer === null) break
-        } else if (this._state === constants.state.IN_CHUNK) {
-          const chunk = this._buffer.subarray(0, i - 1)
-
-          if (chunk.byteLength !== this._length) {
-            hits = 0
-            continue
-          }
-
-          this._buffer =
-            i + 1 === this._buffer.byteLength
-              ? null
-              : this._buffer.subarray(i + 1)
-          i = 0
-          hits = 0
-          this._onchunk(chunk)
-
-          if (this._buffer === null) break
-        }
-      } else if (hits === 2 && b === 13) {
-        hits++
-      } 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)
-          i = 0
-          hits = 0
-          this._onhead(head)
-
-          if (this._buffer === null) break
+    try {
+      for (const op of this._parser.push(data)) {
+        switch (op.type) {
+          case RESPONSE:
+            this.req.on('close', () => {
+              this.req = null
+            })
+
+            this.res = new this._IncomingMessage(this.socket, op.headers, {
+              statusCode: op.code,
+              statusMessage: op.reason
+            })
+
+            this.res.on('close', () => {
+              this.res = null
+
+              this._idle = true
+
+              this.socket.emit('free')
+            })
+
+            if (
+              op.headers.connection &&
+              op.headers.connection.toLowerCase() === 'upgrade'
+            ) {
+              return this._onupgrade(this._parser.end())
+            }
+
+            this.req.emit('response', this.res)
+            break
+
+          case DATA:
+            this.res.push(op.data)
+            break
+
+          case END:
+            if (this.res) this.res.push(null)
+            if (this.req) this.req._continueFinal()
+            break
         }
-      } else {
-        hits = 0
-      }
-    }
-  }
-
-  _onhead(data) {
-    this._state = constants.state.IN_HEAD
-
-    const r = data.toString().split('\r\n')
-    if (r.length === 0) return this.socket.destroy()
-
-    const [, statusCode, ...statusMessage] = r[0].split(' ')
-    if (!statusCode || !statusMessage.length) return this.socket.destroy()
-
-    const headers = {}
-
-    for (let i = 1; i < r.length; i++) {
-      const [name, value] = splitHeader(r[i])
-      if (name === null) return this.socket.destroy()
-      headers[name.toLowerCase()] = value
-    }
-
-    this.req.on('close', () => {
-      this.req = null
-    })
-
-    this.res = new this._IncomingMessage(this.socket, headers, {
-      statusCode: parseInt(statusCode, 10),
-      statusMessage: statusMessage.join(' ')
-    })
-
-    this.res.on('close', () => {
-      this.res = null
-      this._onreset()
-    })
-
-    if (headers.connection && headers.connection.toLowerCase() === 'upgrade') {
-      const head = this._buffer
-      this._buffer = null
-      return this._onupgrade(head)
-    }
-
-    this.req.emit('response', this.res)
-
-    if (headers['transfer-encoding'] === 'chunked') {
-      this._state = constants.state.BEFORE_CHUNK
-    } else {
-      this._length = parseInt(headers['content-length'], 10) || 0
-
-      if (this._length === 0) return this._onfinished()
-
-      this._state = constants.state.IN_BODY
-
-      if (this._buffer) {
-        const body = this._buffer
-        this._buffer = null
-        this._onbody(body)
       }
+    } catch (err) {
+      this.socket.destroy(err)
     }
   }
 
-  _onchunklength(data) {
-    this._length = parseInt(data.toString(), 16)
-
-    if (this._length === 0) this._onfinished()
-    else this._state = constants.state.IN_CHUNK
-  }
-
-  _onchunk(data) {
-    this._read += data.byteLength
-
-    this.res.push(data)
-
-    this._state = constants.state.BEFORE_CHUNK
-  }
-
-  _onbody(data) {
-    this._read += data.byteLength
-
-    this.res.push(data)
-
-    if (this._read === this._length) this._onfinished()
-  }
-
-  _onupgrade(head) {
+  _onupgrade(data) {
     this._ondetach()
 
     const req = this.req
@@ -223,7 +123,7 @@ module.exports = class HTTPClientConnection {
     req.upgrade = true
     req.destroy()
 
-    if (req.emit('upgrade', this.res, this.socket, head || empty)) return
+    if (req.emit('upgrade', this.res, this.socket, data || EMPTY)) return
 
     this.socket.destroy()
   }
@@ -232,21 +132,6 @@ module.exports = class HTTPClientConnection {
     if (this.req) this.req.emit('timeout')
   }
 
-  _onfinished() {
-    if (this.res) this.res.push(null)
-    if (this.req) this.req._continueFinal()
-  }
-
-  _onreset() {
-    this._state = constants.state.BEFORE_HEAD
-    this._length = -1
-    this._read = 0
-    this._buffer = null
-    this._idle = true
-
-    this.socket.emit('free')
-  }
-
   _ondrain() {
     if (this.req) this.req._continueWrite()
   }
@@ -263,9 +148,3 @@ module.exports = class HTTPClientConnection {
     HTTPClientConnection._connections.delete(this.socket)
   }
 }
-
-function splitHeader(s) {
-  const i = s.indexOf(': ')
-  if (i === -1) return [null, null]
-  return [s.slice(0, i), s.slice(i + 2)]
-}

package/lib/client-request.js

@@ -35,6 +35,11 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     if (onresponse) this.once('response', onresponse)
   }
 
+  // For Node.js compatibility
+  abort() {
+    return this.destroy()
+  }
+
   _header() {
     let h = `${this.method} ${this.path} HTTP/1.1\r\n`
 
@@ -64,15 +69,15 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     if (this.headersSent === false) this.flushHeaders()
 
     if (this._chunked) {
-      data = Buffer.concat([
-        Buffer.from(data.byteLength.toString(16)),
-        CHUNK_DELIMITER,
-        data,
-        CHUNK_DELIMITER
-      ])
+      this.socket.write(Buffer.from(data.byteLength.toString(16)))
+      this.socket.write(CHUNK_DELIMITER)
     }
 
-    if (this.socket.write(data)) cb(null)
+    let flushed = this.socket.write(data)
+
+    if (this._chunked) flushed = this.socket.write(CHUNK_DELIMITER)
+
+    if (flushed) cb(null)
     else this._pendingWrite = cb
   }
 

package/lib/constants.d.ts

@@ -1,11 +1,4 @@
 declare const constants: {
-  state: {
-    BEFORE_HEAD: number
-    IN_HEAD: number
-    IN_BODY: number
-    BEFORE_CHUNK: number
-    IN_CHUNK: number
-  }
   method: {
     GET: 'GET'
     HEAD: 'HEAD'

package/lib/constants.js

@@ -1,11 +1,4 @@
 module.exports = {
-  state: {
-    BEFORE_HEAD: 1,
-    IN_HEAD: 2,
-    IN_BODY: 3,
-    BEFORE_CHUNK: 4,
-    IN_CHUNK: 5
-  },
   method: {
     GET: 'GET',
     HEAD: 'HEAD',

package/lib/errors.d.ts

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

package/lib/errors.js

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

package/lib/server-connection.js

@@ -1,10 +1,14 @@
 const tcp = require('bare-tcp')
 const { isEnded, isFinished, getStreamError } = require('bare-stream')
+const HTTPParser = require('bare-http-parser')
 const HTTPIncomingMessage = require('./incoming-message')
 const HTTPServerResponse = require('./server-response')
-const constants = require('./constants')
 
-const empty = Buffer.alloc(0)
+const {
+  constants: { REQUEST, DATA, END }
+} = HTTPParser
+
+const EMPTY = Buffer.alloc(0)
 
 module.exports = class HTTPServerConnection {
   static _connections = new WeakMap()
@@ -28,10 +32,7 @@ module.exports = class HTTPServerConnection {
     this._IncomingMessage = IncomingMessage
     this._ServerResponse = ServerResponse
 
-    this._state = constants.state.BEFORE_HEAD
-    this._length = -1
-    this._read = 0
-    this._buffer = null
+    this._parser = new HTTPParser()
     this._idle = true
 
     this._onclose = this._onclose.bind(this)
@@ -65,161 +66,64 @@ module.exports = class HTTPServerConnection {
   _ondata(data) {
     this._idle = false
 
-    if (this._state === constants.state.IN_BODY) return this._onbody(data)
-
-    if (this._buffer !== null) {
-      this._buffer = Buffer.concat([this._buffer, data])
-    } else {
-      this._buffer = data
-    }
-
-    let hits = 0
-
-    for (let i = 0; i < this._buffer.byteLength; i++) {
-      const b = this._buffer[i]
-
-      if (hits === 0 && b === 13) {
-        hits++
-      } else if (hits === 1 && b === 10) {
-        hits++
-
-        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)
-          i = 0
-          hits = 0
-          this._onchunklength(head)
-
-          if (this._buffer === null) break
-        } else if (this._state === constants.state.IN_CHUNK) {
-          const chunk = this._buffer.subarray(0, i - 1)
-
-          if (chunk.byteLength !== this._length) {
-            hits = 0
-            continue
-          }
-
-          this._buffer =
-            i + 1 === this._buffer.byteLength
-              ? null
-              : this._buffer.subarray(i + 1)
-          i = 0
-          hits = 0
-          this._onchunk(chunk)
-
-          if (this._buffer === null) break
-        }
-      } else if (hits === 2 && b === 13) {
-        hits++
-      } 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)
-          i = 0
-          hits = 0
-          this._onhead(head)
-
-          if (this._buffer === null) break
+    try {
+      for (const op of this._parser.push(data)) {
+        switch (op.type) {
+          case REQUEST:
+            this.req = new this._IncomingMessage(this.socket, op.headers, {
+              method: op.method,
+              url: op.url
+            })
+
+            this.req.on('close', () => {
+              this.req = null
+
+              this._idle = true
+
+              if (this.server._state & tcp.constants.state.CLOSING) {
+                this.socket.destroy()
+              }
+            })
+
+            // Eagerly open the request stream
+            this.req.resume()
+            this.req.pause()
+
+            if (
+              op.headers.connection &&
+              op.headers.connection.toLowerCase() === 'upgrade'
+            ) {
+              return this._onupgrade(this._parser.end())
+            }
+
+            this.res = new this._ServerResponse(
+              this.socket,
+              this.req,
+              op.headers.connection === 'close'
+            )
+
+            this.res.on('close', () => {
+              this.res = null
+            })
+
+            this.server.emit('request', this.req, this.res)
+            break
+
+          case DATA:
+            this.req.push(op.data)
+            break
+
+          case END:
+            if (this.req) this.req.push(null)
+            break
         }
-      } else {
-        hits = 0
-      }
-    }
-  }
-
-  _onhead(data) {
-    this._state = constants.state.IN_HEAD
-
-    const r = data.toString().split('\r\n')
-    if (r.length === 0) return this.socket.destroy()
-
-    const [method, url] = r[0].split(' ')
-    if (!method || !url) return this.socket.destroy()
-
-    const headers = {}
-
-    for (let i = 1; i < r.length; i++) {
-      const [name, value] = splitHeader(r[i])
-      if (name === null) return this.socket.destroy()
-      headers[name.toLowerCase()] = value
-    }
-
-    this.req = new this._IncomingMessage(this.socket, headers, { method, url })
-
-    this.req.on('close', () => {
-      this.req = null
-      this._onreset()
-    })
-
-    // Eagerly open the request stream
-    this.req.resume()
-    this.req.pause()
-
-    if (headers.connection && headers.connection.toLowerCase() === 'upgrade') {
-      const head = this._buffer
-      this._buffer = null
-      return this._onupgrade(head)
-    }
-
-    this.res = new this._ServerResponse(
-      this.socket,
-      this.req,
-      headers.connection === 'close'
-    )
-
-    this.res.on('close', () => {
-      this.res = null
-    })
-
-    this.server.emit('request', this.req, this.res)
-
-    if (headers['transfer-encoding'] === 'chunked') {
-      this._state = constants.state.BEFORE_CHUNK
-    } else {
-      this._length = parseInt(headers['content-length'], 10) || 0
-
-      if (this._length === 0) return this._onfinished()
-
-      this._state = constants.state.IN_BODY
-
-      if (this._buffer) {
-        const body = this._buffer
-        this._buffer = null
-        this._onbody(body)
       }
+    } catch (err) {
+      this.socket.destroy(err)
     }
   }
 
-  _onchunklength(data) {
-    this._length = parseInt(data.toString(), 16)
-
-    if (this._length === 0) this._onfinished()
-    else this._state = constants.state.IN_CHUNK
-  }
-
-  _onchunk(data) {
-    this._read += data.byteLength
-
-    this.req.push(data)
-
-    this._state = constants.state.BEFORE_CHUNK
-  }
-
-  _onbody(data) {
-    this._read += data.byteLength
-
-    this.req.push(data)
-
-    if (this._read === this._length) this._onfinished()
-  }
-
-  _onupgrade(head) {
+  _onupgrade(data) {
     this._ondetach()
 
     const req = this.req
@@ -227,7 +131,7 @@ module.exports = class HTTPServerConnection {
     req.upgrade = true
     req.destroy()
 
-    this.server.emit('upgrade', req, this.socket, head || empty)
+    this.server.emit('upgrade', req, this.socket, data || EMPTY)
   }
 
   _ontimeout() {
@@ -238,22 +142,6 @@ module.exports = class HTTPServerConnection {
     if (!reqTimeout && !resTimeout && !serverTimeout) this.socket.destroy()
   }
 
-  _onfinished() {
-    if (this.req) this.req.push(null)
-  }
-
-  _onreset() {
-    this._state = constants.state.BEFORE_HEAD
-    this._length = -1
-    this._read = 0
-    this._buffer = null
-    this._idle = true
-
-    if (this.server._state & tcp.constants.state.CLOSING) {
-      this.socket.destroy()
-    }
-  }
-
   _ondrain() {
     if (this.res) this.res._continueWrite()
   }
@@ -271,9 +159,3 @@ module.exports = class HTTPServerConnection {
 }
 
 function noop() {}
-
-function splitHeader(s) {
-  const i = s.indexOf(': ')
-  if (i === -1) return [null, null]
-  return [s.slice(0, i), s.slice(i + 2)]
-}

package/lib/server-response.js

@@ -1,6 +1,9 @@
 const HTTPOutgoingMessage = require('./outgoing-message')
 const constants = require('./constants')
 
+const CHUNK_DELIMITER = Buffer.from('\r\n')
+const CHUNK_TERMINATOR = Buffer.from('0\r\n\r\n')
+
 module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
   constructor(socket, req, close) {
     super(socket)
@@ -77,14 +80,15 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
     if (this._onlyHeaders === true) return cb(null)
 
     if (this._chunked) {
-      data = Buffer.concat([
-        Buffer.from('' + data.byteLength.toString(16) + '\r\n'),
-        data,
-        Buffer.from('\r\n')
-      ])
+      this.socket.write(Buffer.from(data.byteLength.toString(16)))
+      this.socket.write(CHUNK_DELIMITER)
     }
 
-    if (this.socket.write(data)) cb(null)
+    let flushed = this.socket.write(data)
+
+    if (this._chunked) flushed = this.socket.write(CHUNK_DELIMITER)
+
+    if (flushed) cb(null)
     else this._pendingWrite = cb
   }
 
@@ -94,8 +98,10 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
       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(CHUNK_TERMINATOR)
+    }
+
     if (this._close) this.socket.end()
 
     cb(null)

package/package.json

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